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

2025/7/6

master
Aoi_Tori 1 year ago
parent
572f8656a0
commit
59bc4f7985
9 changed files with 131 additions and 87 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. 14
      src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
  2. 58
      src/views/modules/project/projectInfo/projectInfo.vue
  3. 4
      src/views/modules/project/projectPart/searchProjectPart.vue
  4. 4
      src/views/modules/proofing/requestForProofing.vue
  5. 4
      src/views/modules/quotation/requestForQuote.vue
  6. 4
      src/views/modules/quotation/sellForQuotation/quotationProjectInformation.vue
  7. 8
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
  8. 118
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue
  9. 4
      src/views/modules/test/requestForTest.vue

14
src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
View File

@ -53,21 +53,21 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item prop="customerId"> <el-form-item prop="customerId">
<span slot="label" style="" @click="getBaseList(102,1)"><a herf="#">直接客户</a></span>
<span slot="label" style="" @click="getBaseList(102,1)"><a herf="#">客户</a></span>
<el-input v-model="dataForm.customerId" @blur="getCustomerName(1)"></el-input> <el-input v-model="dataForm.customerId" @blur="getCustomerName(1)"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="customerName" label="直接客户名称">
<el-form-item prop="customerName" label="客户名称">
<el-input v-model="dataForm.customerName" disabled></el-input> <el-input v-model="dataForm.customerName" disabled></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="终端客户">
<!-- <span slot="label" style="" @click="getBaseList(102,2)"><a herf="#">终端客户</a></span>-->
<!-- <el-input v-model="dataForm.finalCustomerId" @blur="getCustomerName(2)"></el-input>-->
<dict-data-select v-model="dataForm.finalCustomerId" clearable filterable dict-type="finalCustomer" :use-default-value="true"></dict-data-select>
</el-form-item>
<!-- <el-form-item label="终端客户">-->
<!--&lt;!&ndash; <span slot="label" style="" @click="getBaseList(102,2)"><a herf="#">终端客户</a></span>&ndash;&gt;-->
<!--&lt;!&ndash; <el-input v-model="dataForm.finalCustomerId" @blur="getCustomerName(2)"></el-input>&ndash;&gt;-->
<!-- <dict-data-select v-model="dataForm.finalCustomerId" clearable filterable dict-type="finalCustomer" :use-default-value="true"></dict-data-select>-->
<!-- </el-form-item>-->
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="Product set"> <el-form-item label="Product set">

58
src/views/modules/project/projectInfo/projectInfo.vue
View File

@ -136,11 +136,11 @@
<el-input v-model="projectData.projectDesc" readonly style="" ></el-input> <el-input v-model="projectData.projectDesc" readonly style="" ></el-input>
</el-form-item> </el-form-item>
</div></el-col> </div></el-col>
<el-col :span="5"><div class="grid-content bg-purple">
<el-form-item :label="'最终客户'">
<el-input v-model="projectData.finalCustomerName" readonly style="" ></el-input>
</el-form-item>
</div></el-col>
<!-- <el-col :span="5"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'最终客户'">-->
<!-- <el-input v-model="projectData.finalCustomerName" readonly style="" ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<el-col :span="5"><div class="grid-content bg-purple"> <el-col :span="5"><div class="grid-content bg-purple">
<el-form-item :label="'客户项目编号'"> <el-form-item :label="'客户项目编号'">
<el-input v-model="projectData.customerProjectNo" readonly style="" ></el-input> <el-input v-model="projectData.customerProjectNo" readonly style="" ></el-input>
@ -151,20 +151,22 @@
<el-input v-model="projectData.productSet" readonly style="" ></el-input> <el-input v-model="projectData.productSet" readonly style="" ></el-input>
</el-form-item> </el-form-item>
</div></el-col> </div></el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8"><div class="grid-content bg-purple">
<el-col :span="5"><div class="grid-content bg-purple">
<!-- <el-col :span="8"><div class="grid-content bg-purple">-->
<el-form-item :label="'项目经理'"> <el-form-item :label="'项目经理'">
<el-input v-model="projectData.projectManagerName" readonly style="" ></el-input> <el-input v-model="projectData.projectManagerName" readonly style="" ></el-input>
</el-form-item> </el-form-item>
</div></el-col> </div></el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8"><div class="grid-content bg-purple"> <el-col :span="8"><div class="grid-content bg-purple">
<el-form-item :label="'项目负责人'"> <el-form-item :label="'项目负责人'">
<el-input v-model="projectData.projectOwnerName" readonly style="" ></el-input> <el-input v-model="projectData.projectOwnerName" readonly style="" ></el-input>
</el-form-item> </el-form-item>
</div></el-col> </div></el-col>
<el-col :span="8"><div class="grid-content bg-purple">
<el-col :span="16"><div class="grid-content bg-purple">
<!-- <el-col :span="8"><div class="grid-content bg-purple">-->
<el-form-item :label="'项目权限'"> <el-form-item :label="'项目权限'">
<el-input v-model="projectData.userRoleName" readonly style="" ></el-input> <el-input v-model="projectData.userRoleName" readonly style="" ></el-input>
</el-form-item> </el-form-item>
@ -1996,9 +1998,7 @@
resolve(true); resolve(true);
}else { }else {
reject(new Error('该项目已存在附件，不允许删除！')) reject(new Error('该项目已存在附件，不允许删除！'))
this.$alert('该项目已存在附件，不允许删除！', '提示', {
confirmButtonText: '确定'
})
this.$message.warning('该项目已存在附件，不允许删除！')
} }
} else { } else {
this.$message.warning(data.msg); this.$message.warning(data.msg);
@ -2027,9 +2027,7 @@
resolve(true); resolve(true);
} else { } else {
reject(new Error('该项目已绑定物料信息，不允许删除！')) reject(new Error('该项目已绑定物料信息，不允许删除！'))
this.$alert('该项目已绑定物料信息，不允许删除！', '提示', {
confirmButtonText: '确定'
})
this.$message.warning('该项目已绑定物料信息，不允许删除！')
} }
} }
}) })
@ -2052,9 +2050,7 @@
resolve(true); resolve(true);
}else { }else {
reject(new Error('该项目已存在询价信息，不允许删除！')) reject(new Error('该项目已存在询价信息，不允许删除！'))
this.$alert('该项目已存在询价信息，不允许删除！', '提示', {
confirmButtonText: '确定'
})
this.$message.warning('该项目已存在询价信息，不允许删除！')
} }
} else { } else {
this.$message.warning(data.msg); this.$message.warning(data.msg);
@ -2074,9 +2070,7 @@
resolve(true); resolve(true);
}else { }else {
reject(new Error('该项目已存在报价信息，不允许删除！')) reject(new Error('该项目已存在报价信息，不允许删除！'))
this.$alert('该项目已存在报价信息，不允许删除！', '提示', {
confirmButtonText: '确定'
})
this.$message.warning('该项目已存在报价信息，不允许删除！')
} }
}else { }else {
this.$message.warning(data.msg); this.$message.warning(data.msg);
@ -2100,9 +2094,7 @@
resolve(true); resolve(true);
}else { }else {
reject(new Error('该项目已存在打样信息，不允许删除！')) reject(new Error('该项目已存在打样信息，不允许删除！'))
this.$alert('该项目已存在打样信息，不允许删除！', '提示', {
confirmButtonText: '确定'
})
this.$message.warning('该项目已存在打样信息，不允许删除！')
} }
} else { } else {
this.$message.warning(data.msg) this.$message.warning(data.msg)
@ -2126,9 +2118,7 @@
resolve(true); resolve(true);
} else { } else {
reject(new Error('该项目已存在测试记录，不允许删除！')) reject(new Error('该项目已存在测试记录，不允许删除！'))
this.$alert('该项目已存在测试记录，不允许删除！', '提示', {
confirmButtonText: '确定'
})
this.$message.warning('该项目已存在测试记录，不允许删除！')
} }
} else { } else {
this.$message.warning(data.msg); this.$message.warning(data.msg);
@ -2150,9 +2140,7 @@
resolve(true); resolve(true);
} else { } else {
reject(new Error('该项目已存在刀模申请，不允许删除！')) reject(new Error('该项目已存在刀模申请，不允许删除！'))
this.$alert('该项目已存在刀模申请，不允许删除！', '提示', {
confirmButtonText: '确定'
})
this.$message.warning('该项目已存在刀模申请，不允许删除！')
} }
} else { } else {
this.$message.warning(data.msg) this.$message.warning(data.msg)
@ -2174,10 +2162,8 @@
if (data.page.list.length===0){ if (data.page.list.length===0){
resolve(true); resolve(true);
} else { } else {
this.$alert('该项目已绑定技术参数卡，不允许删除！', '提示', {
confirmButtonText: '确定'
})
reject(new Error('该项目已绑定技术参数卡，不允许删除！')) reject(new Error('该项目已绑定技术参数卡，不允许删除！'))
this.$message.warning('该项目已绑定技术参数卡，不允许删除！')
} }
} else { } else {
this.$message.warning(data.msg); this.$message.warning(data.msg);
@ -2197,10 +2183,8 @@
if (data.rows.length===0){ if (data.rows.length===0){
resolve(true); resolve(true);
} else { } else {
this.$alert('该项目已存在变更记录，不允许删除！', '提示', {
confirmButtonText: '确定'
})
reject(new Error('该项目已存在变更记录，不允许删除！')) reject(new Error('该项目已存在变更记录，不允许删除！'))
this.$message.warning('该项目已存在变更记录，不允许删除！')
} }
} else { } else {
this.$message.warning(data.msg) this.$message.warning(data.msg)

4
src/views/modules/project/projectPart/searchProjectPart.vue
View File

@ -127,11 +127,11 @@
<el-input v-model="projectData.projectDesc" readonly style="" ></el-input> <el-input v-model="projectData.projectDesc" readonly style="" ></el-input>
</el-form-item> </el-form-item>
</div></el-col> </div></el-col>
<el-col :span="5"><div class="grid-content bg-purple">
<!-- <el-col :span="5"><div class="grid-content bg-purple">
<el-form-item :label="'最终客户'"> <el-form-item :label="'最终客户'">
<el-input v-model="projectData.finalCustomerName" readonly style="" ></el-input> <el-input v-model="projectData.finalCustomerName" readonly style="" ></el-input>
</el-form-item> </el-form-item>
</div></el-col>
</div></el-col>-->
<el-col :span="5"><div class="grid-content bg-purple"> <el-col :span="5"><div class="grid-content bg-purple">
<el-form-item :label="'客户项目料号'"> <el-form-item :label="'客户项目料号'">
<el-input v-model="projectData.customerProjectNo" readonly style="" ></el-input> <el-input v-model="projectData.customerProjectNo" readonly style="" ></el-input>

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

@ -599,13 +599,13 @@
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item label="终端客户"> <el-form-item label="终端客户">
<el-input v-model="projectInformationData.finalCustomerName" readonly></el-input> <el-input v-model="projectInformationData.finalCustomerName" readonly></el-input>
</el-form-item> </el-form-item>
</div> </div>
</el-col>
</el-col>-->
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">

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

@ -631,13 +631,13 @@
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item label="终端客户"> <el-form-item label="终端客户">
<el-input v-model="projectInformationData.finalCustomerName" readonly></el-input> <el-input v-model="projectInformationData.finalCustomerName" readonly></el-input>
</el-form-item> </el-form-item>
</div> </div>
</el-col>
</el-col>-->
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">

4
src/views/modules/quotation/sellForQuotation/quotationProjectInformation.vue
View File

@ -39,13 +39,13 @@
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item label="终端客户"> <el-form-item label="终端客户">
<el-input v-model="projectInformationData.finalCustomerName" readonly></el-input> <el-input v-model="projectInformationData.finalCustomerName" readonly></el-input>
</el-form-item> </el-form-item>
</div> </div>
</el-col>
</el-col>-->
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">

8
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
View File

@ -38,7 +38,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="6"> <el-col :span="6">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item :label="'直接客户/Direct Customer'">
<el-form-item :label="'客户/Customer'">
<el-input v-model="dataForm.customerId" disabled></el-input> <el-input v-model="dataForm.customerId" disabled></el-input>
</el-form-item> </el-form-item>
</div> </div>
@ -52,7 +52,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item :label="'终端客户/End Customer'">
<!-- <el-form-item :label="'终端客户/End Customer'">
<dict-data-select <dict-data-select
v-if="dataForm.site" v-if="dataForm.site"
v-model="dataForm.finalCustomerNo" v-model="dataForm.finalCustomerNo"
@ -62,6 +62,9 @@
:use-default-value="true" :use-default-value="true"
:disabled="plmStepRoleBaseBmFlag('finalCustomerNo') === 'N'"> :disabled="plmStepRoleBaseBmFlag('finalCustomerNo') === 'N'">
</dict-data-select> </dict-data-select>
</el-form-item>-->
<el-form-item label="直接客户/Direct Customer">
<el-input v-model="dataForm.directCustomer" type="text"></el-input>
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
@ -384,6 +387,7 @@
productionFileComments: '', productionFileComments: '',
remark: '', remark: '',
nodeId: '', nodeId: '',
directCustomer: ''
}, },
dataForm2: { dataForm2: {
customerRevNo: '', customerRevNo: '',

118
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue
View File

@ -95,7 +95,7 @@
label="容积(BCM)"> label="容积(BCM)">
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="印刷速度" header-align="center">
<!-- <el-table-column label="印刷速度" header-align="center">
<el-table-column <el-table-column
prop="speed" prop="speed"
header-align="center" header-align="center"
@ -119,27 +119,27 @@
min-width="100" min-width="100"
label="机台"> label="机台">
</el-table-column> </el-table-column>
<!-- <el-table-column-->
<!-- prop="gallus"-->
<!-- header-align="center"-->
<!-- align="left"-->
<!-- min-width="100"-->
<!-- label="Gallus(level%)">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="markAndy"-->
<!-- header-align="center"-->
<!-- align="left"-->
<!-- min-width="100"-->
<!-- label="MarkAndy(level%)">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="hexiang"-->
<!-- header-align="center"-->
<!-- align="left"-->
<!-- min-width="100"-->
<!-- label="Hexiang(L/H)">-->
<!-- </el-table-column>-->
&lt;!&ndash; <el-table-column&ndash;&gt;
&lt;!&ndash; prop="gallus"&ndash;&gt;
&lt;!&ndash; header-align="center"&ndash;&gt;
&lt;!&ndash; align="left"&ndash;&gt;
&lt;!&ndash; min-width="100"&ndash;&gt;
&lt;!&ndash; label="Gallus(level%)">&ndash;&gt;
&lt;!&ndash; </el-table-column>&ndash;&gt;
&lt;!&ndash; <el-table-column&ndash;&gt;
&lt;!&ndash; prop="markAndy"&ndash;&gt;
&lt;!&ndash; header-align="center"&ndash;&gt;
&lt;!&ndash; align="left"&ndash;&gt;
&lt;!&ndash; min-width="100"&ndash;&gt;
&lt;!&ndash; label="MarkAndy(level%)">&ndash;&gt;
&lt;!&ndash; </el-table-column>&ndash;&gt;
&lt;!&ndash; <el-table-column&ndash;&gt;
&lt;!&ndash; prop="hexiang"&ndash;&gt;
&lt;!&ndash; header-align="center"&ndash;&gt;
&lt;!&ndash; align="left"&ndash;&gt;
&lt;!&ndash; min-width="100"&ndash;&gt;
&lt;!&ndash; label="Hexiang(L/H)">&ndash;&gt;
&lt;!&ndash; </el-table-column>&ndash;&gt;
</el-table-column> </el-table-column>
<el-table-column label="热覆温度" header-align="center"> <el-table-column label="热覆温度" header-align="center">
<el-table-column <el-table-column
@ -158,7 +158,54 @@
min-width="100" min-width="100"
label="Pressure"> label="Pressure">
</el-table-column> </el-table-column>
</el-table-column>-->
<el-table-column label="机台" header-align="center">
<el-table-column
prop="resourceNo"
header-align="center"
align="left"
min-width="100"
label="Machine">
</el-table-column>
</el-table-column>
<el-table-column label="印刷速度" header-align="center">
<el-table-column
prop="speed"
header-align="center"
align="left"
min-width="60"
label="Speed">
</el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="干燥条件" header-align="center">
<el-table-column
prop="openFlag"
header-align="center"
align="left"
min-width="100"
label="红外">
</el-table-column>
<el-table-column
prop="temperature"
header-align="center"
align="left"
min-width="100"
label="UV">
</el-table-column>
</el-table-column>
<el-table-column label="覆膜张力" header-align="center">
<el-table-column
prop="pressure"
header-align="center"
align="left"
min-width="120"
label="Laminate tension">
</el-table-column>
</el-table-column>
<el-table-column label="备注" header-align="center"> <el-table-column label="备注" header-align="center">
<el-table-column <el-table-column
prop="remark" prop="remark"
@ -221,18 +268,27 @@
<el-form-item :label="'机台/Machine No.'"> <el-form-item :label="'机台/Machine No.'">
<dict-data-select :site="colorData.site" v-if="colorData.site" v-model="colorData.resourceNo" style="width: 145px" dict-type="bm_printingFlexo_resource"></dict-data-select> <dict-data-select :site="colorData.site" v-if="colorData.site" v-model="colorData.resourceNo" style="width: 145px" dict-type="bm_printingFlexo_resource"></dict-data-select>
</el-form-item> </el-form-item>
<el-form-item :label="'热覆温度/Temperature'">
<!-- <el-form-item :label="'热覆温度/Temperature'">-->
<!-- <el-input v-model="colorData.temperature" style="width: 145px" ></el-input>-->
<!-- </el-form-item>-->
<el-form-item :label="'UV'">
<el-input v-model="colorData.temperature" style="width: 145px" ></el-input> <el-input v-model="colorData.temperature" style="width: 145px" ></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'红外干燥/Infra-Red(ON /OFF)'">
<el-select v-model="colorData.openFlag" style="width: 145px">
<el-option label="ON" value="ON"></el-option>
<el-option label="OFF" value="OFF"></el-option>
</el-select>
<!-- <el-form-item :label="'红外干燥/Infra-Red(ON /OFF)'">-->
<!-- <el-select v-model="colorData.openFlag" style="width: 145px">-->
<!-- <el-option label="ON" value="ON"></el-option>-->
<!-- <el-option label="OFF" value="OFF"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item :label="'红外'">
<el-input v-model="colorData.openFlag" style="width: 145px" ></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item :label="'热覆压力/Pressure'">
<!-- <el-form-item :label="'热覆压力/Pressure'">-->
<!-- <el-input v-model="colorData.pressure" style="width: 145px"></el-input>-->
<!-- </el-form-item>-->
<el-form-item :label="'覆膜张力/Laminate Tension'">
<el-input v-model="colorData.pressure" style="width: 145px"></el-input> <el-input v-model="colorData.pressure" style="width: 145px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'备注/Remark'"> <el-form-item :label="'备注/Remark'">
@ -366,7 +422,7 @@
site: this.searchData.site, site: this.searchData.site,
codeNo: this.searchData.codeNo, codeNo: this.searchData.codeNo,
order: number, order: number,
printSide: 'front',
printSide: 'Front',
colorReference: '', colorReference: '',
inkCode: '', inkCode: '',
colorMatch: '', colorMatch: '',
@ -428,7 +484,7 @@
let tempData = { let tempData = {
site: this.searchData.site, site: this.searchData.site,
codeNo: this.searchData.codeNo, codeNo: this.searchData.codeNo,
printSide: 'front',
printSide: 'Front',
} }
saveBMPrintFlexoColorBatch(tempData).then(({data}) => { saveBMPrintFlexoColorBatch(tempData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {

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

@ -743,13 +743,13 @@
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item label="终端客户"> <el-form-item label="终端客户">
<el-input v-model="projectInformationData.finalCustomerName" readonly></el-input> <el-input v-model="projectInformationData.finalCustomerName" readonly></el-input>
</el-form-item> </el-form-item>
</div> </div>
</el-col>
</el-col>-->
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">

Write Preview
Loading…
Cancel
Save