Browse Source

plm BM

master
ruanqi 1 year ago
parent
commit
879595e05b
  1. 4
      src/views/modules/demoComponents/orderProperties.vue
  2. 82
      src/views/modules/sampleManagement/com_technical-add-or-update.vue
  3. 19
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingIndigo.vue

4
src/views/modules/demoComponents/orderProperties.vue

@ -380,10 +380,10 @@ export default {
</div>
<div v-else>
<el-select style="width: 100%;" v-if="scope.row.valueType === '文本'" v-model="scope.row.textValue">
<el-option :value="i.availableValue" :label="i.availableValue" v-for="(i,key) in scope.row.list" :key="key"></el-option>
<el-option :value="i.availableValue" :label="i.availableValue" v-for="(i,key) in scope.row.availableList" :key="key"></el-option>
</el-select>
<el-select style="width: 100%;" v-else v-model="scope.row.numValue">
<el-option :value="i.availableValue" :label="i.availableValue" v-for="(i,key) in scope.row.list" :key="key"></el-option>
<el-option :value="i.availableValue" :label="i.availableValue" v-for="(i,key) in scope.row.availableList" :key="key"></el-option>
</el-select>
</div>
</div>

82
src/views/modules/sampleManagement/com_technical-add-or-update.vue

@ -14,7 +14,7 @@
<el-checkbox v-model="jumpFlag">保存后跳转至详情</el-checkbox>
</el-form-item>
<el-form-item prop="testPartNo" :rules="dataRole.testPartNo" style="margin-left: 12px">
<span slot="label" style="" @click="getBaseList(134,1)" ><a herf="#">测试料号</a></span>
<span slot="label" style="" @click="getBaseList(134,1)" ><a herf="#">项目料号</a></span>
<el-input v-model="dataForm.testPartNo" @change="changeTestDesc" style="width: 130px" :disabled="dataForm.id!=0" ></el-input>
</el-form-item>
</el-form>
@ -124,7 +124,27 @@
title="选择打样单"
:close-on-click-modal="false"
:visible.sync="proofingModelFlag">
<el-form :inline="true" label-position="top" label-width="100px" :rules="dataRole">
<el-form :inline="true" label-position="top" label-width="100px" >
<el-form-item style="margin-left: 0px">
<span slot="label" style="" @click="getBaseList(104,2)" ><a herf="#">项目号</a></span>
<el-input v-model="proofingSearch.projectId" style="width: 130px" ></el-input>
</el-form-item>
<el-form-item style="margin-left: 0px">
<span slot="label" style="" @click="getBaseList(501,2)" ><a herf="#">打样单</a></span>
<el-input v-model="proofingSearch.proofingNo" style="width: 130px" ></el-input>
</el-form-item>
<el-form-item style="margin-left: 0px">
<span slot="label" style="" @click="getBaseList(102,2)" ><a herf="#">直接客户</a></span>
<el-input v-model="proofingSearch.customerId" style="width: 130px" ></el-input>
</el-form-item>
<el-form-item style="margin-left: 0px">
<span slot="label" style="" @click="getBaseList(102,3)" ><a herf="#">最终客户</a></span>
<el-input v-model="proofingSearch.finalCustomerId" style="width: 130px" ></el-input>
</el-form-item>
<el-form-item label=" ">
<el-button type="primary" @click="refreshProofingList()">{{'查询'}}</el-button>
</el-form-item>
</el-form>
<el-table
height="450"
:data="proofingList"
@ -184,7 +204,6 @@
label="最终客户">
</el-table-column>
</el-table>
</el-form>
</el-dialog>
@ -239,6 +258,14 @@
technicianList:[],
oriCodeNo:'',
},
proofingSearch:{
projectId:'',
proofingNo:'',
customerId:'',
finalCustomerId:'',
site:this.$store.state.user.site,
username:this.$store.state.user.name,
},
quotationOfficerList:[],
engineerList:[],
technicianList:[],
@ -303,6 +330,22 @@
if(type==1) {
strVal = this.dataForm.customerId
}
if(type==2) {
strVal = this.proofingSearch.customerId
}
if(type==3) {
strVal = this.proofingSearch.finalCustomerId
}
}
if (val === 104) {
if(type==2) {
strVal = this.proofingSearch.projectId
}
}
if (val === 501) {
if(type==2) {
strVal = this.proofingSearch.proofingNo
}
}
if (val === 1011) {
if(type==1) {
@ -331,6 +374,22 @@
this.dataForm.customerId = val.Customer_no
this.dataForm.customerName = val.Customer_desc
}
if(this.tagNo1==2) {
this.proofingSearch.customerId = val.Customer_no
}
if(this.tagNo1==3) {
this.proofingSearch.finalCustomerId = val.Customer_no
}
}
if (this.tagNo === 104) {
if(this.tagNo1==2) {
this.proofingSearch.projectId = val.project_id
}
}
if (this.tagNo === 501) {
if(this.tagNo1==2) {
this.proofingSearch.proofingNo = val.Proofing_no
}
}
if (this.tagNo === 1011) {
if(this.tagNo1==1) {
@ -413,16 +472,25 @@
if(this.dataForm.id!=0){
return false;
}
let inData={
site:this.dataForm.site,
username:this.$store.state.user.name,
this.proofingSearch={
projectId:'',
proofingNo:'',
customerId:'',
finalCustomerId:'',
site:this.$store.state.user.site,
username:this.$store.state.user.name,
}
getProofingDataByUserRole(inData).then(({data}) => {
getProofingDataByUserRole(this.proofingSearch).then(({data}) => {
this.proofingList=data.rows
})
this.proofingModelFlag=true
},
refreshProofingList(){
getProofingDataByUserRole(this.proofingSearch).then(({data}) => {
this.proofingList=data.rows
})
},
changeProofingNoChange(){
let inData={
site:this.dataForm.site,

19
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingIndigo.vue

@ -199,10 +199,21 @@
</el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item :label="'Remark'">
<el-input v-model="colorData.remark" style="width: 530px" ></el-input>
<!-- <el-input v-model="colorData.remark" style="width: 530px" ></el-input>-->
<el-input
type="textarea"
v-model="colorData.remark"
:rows="3"
resize='none'
maxlength="255"
show-word-limit
:disabled="ifDisableFlag"
style="height: 60px;width: 561px" >
</el-input>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-footer style="height:40px;margin-top: 70px;text-align:center">
<el-button type="primary" @click="colorSave()">保存</el-button>
<el-button type="primary" @click="colorFlag = false">取消</el-button>
</el-footer>
@ -269,7 +280,7 @@
let strVal = ''
if (val === 133) {
if(type==1) {
strVal = this.colorData.colorReference
strVal = this.colorData.inkCode
}
}
this.$refs.baseList.init(val, strVal)
@ -279,7 +290,7 @@
getBaseData (val) {
if (this.tagNo === 133) {
if(this.tagNo1==1) {
this.colorData.colorReference = val.part_no
this.colorData.inkCode = val.part_no
}
}
},

Loading…
Cancel
Save