FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2021-09-30 18:00:19 +08:00
parent 4ac5dd4cfb 16d2a9ab9e
commit ef2a4a1256
22 changed files with 748 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+28 -1
View File
@@ -29,19 +29,37 @@
</el-form-item>
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
v-if="listForm.standNumber && listForm.standNumber.length>0"
class="input-jump"
@click.native="handlePreview(listForm)"
readonly
v-model="listForm.standNumber"
placeholder="请输入标准编号"
></el-input>
<el-input
v-else
class="input-jump"
readonly
v-model="listForm.standNumber"
placeholder="请输入标准编号"
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-if="listForm.standName && listForm.standName.length>0"
class="input-jump"
@click.native="handlePreview(listForm)"
readonly
v-model="listForm.standName"
placeholder="请输入标准名称"
></el-input>
<el-input
v-else
class="input-jump"
readonly
v-model="listForm.standName"
placeholder="请输入标准名称"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
@@ -777,11 +795,15 @@ export default {
if (this.dataList.length < 1) {
this.satisfyFlag = false
this.$message.warning("请添加产品线信息");
}else{
this.satisfyFlag = true
}
this.dataList.forEach(item => {
if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
if (!item.distributePerson) {
this.satisfyFlag = false
this.$message.warning("请选择分发责任人");
}else{
this.satisfyFlag = true
}
});
if(this.satisfyFlag){
@@ -1055,6 +1077,11 @@ export default {
height: 100%;
}
}
.input-jump {
/deep/.el-input__inner{
color: #409EFF;
}
}
}
.demo-drawer-content {
src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue
+45 -10
View File
@@ -24,6 +24,7 @@
<el-col :span="24">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standNumber"
placeholder="请输入标准编号"
readonly
@@ -32,26 +33,41 @@
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
></el-input>
</el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
@@ -82,18 +98,32 @@
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
></el-input>
</el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col>
@@ -505,6 +535,11 @@ export default {
height: 100%;
}
}
.input-jump {
/deep/.el-input__inner{
color: #409EFF;
}
}
}
.demo-drawer-content {
src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
+41 -6
View File
@@ -24,6 +24,7 @@
<el-col :span="24">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standNumber"
placeholder="请输入标准编号"
readonly
@@ -32,24 +33,39 @@
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
readonly
></el-input>
</el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col>
@@ -82,18 +98,32 @@
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
readonly
></el-input>
</el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col>
@@ -708,6 +738,11 @@ export default {
height: 100%;
}
}
.input-jump {
/deep/.el-input__inner{
color: #409EFF;
}
}
}
.demo-drawer-content {
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+34 -1
View File
@@ -29,19 +29,37 @@
</el-form-item>
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
v-if="listForm.standNumber && listForm.standNumber.length>0"
class="input-jump"
@click.native="handlePreview(listForm)"
readonly
v-model="listForm.standNumber"
placeholder="请输入标准编号"
></el-input>
<el-input
v-else
class="input-jump"
readonly
v-model="listForm.standNumber"
placeholder="请输入标准编号"
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-if="listForm.standName && listForm.standName.length>0"
class="input-jump"
@click.native="handlePreview(listForm)"
readonly
v-model="listForm.standName"
placeholder="请输入标准名称"
></el-input>
<el-input
v-else
class="input-jump"
readonly
v-model="listForm.standName"
placeholder="请输入标准名称"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
@@ -85,6 +103,12 @@
v-model="listForm.standNumber"
placeholder="请输入标准编号"
></el-input>
<el-input
@click.native="handlePreview(listForm)"
readonly
v-model="listForm.standNumber"
placeholder="请输入标准编号"
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
@@ -750,11 +774,15 @@ export default {
if (this.dataList.length < 1) {
this.satisfyFlag = false
this.$message.warning("请添加产品线信息");
}else {
this.satisfyFlag = true
}
this.dataList.forEach(item => {
if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
if (!item.distributePerson) {
this.satisfyFlag = false
this.$message.warning("请选择分发责任人");
}else {
this.satisfyFlag = true
}
});
if(this.satisfyFlag){
@@ -1029,6 +1057,11 @@ export default {
height: 100%;
}
}
.input-jump {
/deep/.el-input__inner{
color: #409EFF;
}
}
}
.demo-drawer-content {
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+45 -10
View File
@@ -24,6 +24,7 @@
<el-col :span="24">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standNumber"
placeholder="请输入标准编号"
readonly
@@ -32,26 +33,41 @@
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
></el-input>
</el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
@@ -82,18 +98,32 @@
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
></el-input>
</el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col>
@@ -570,6 +600,11 @@ export default {
height: 100%;
}
}
.input-jump {
/deep/.el-input__inner{
color: #409EFF;
}
}
}
.demo-drawer-content {
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+46 -11
View File
@@ -24,6 +24,7 @@
<el-col :span="24">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standNumber"
placeholder="请输入标准编号"
readonly
@@ -32,24 +33,39 @@
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
readonly
></el-input>
</el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col>
@@ -82,18 +98,32 @@
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
readonly
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
></el-input>
</el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
readonly
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col>
@@ -746,6 +776,11 @@ export default {
height: 100%;
}
}
.input-jump {
/deep/.el-input__inner{
color: #409EFF;
}
}
}
.demo-drawer-content {
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+127 -15
View File
@@ -24,6 +24,7 @@
<el-col :span="24">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standNumber"
placeholder="请输入标准编号"
readonly
@@ -32,24 +33,39 @@
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
readonly
></el-input>
</el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col>
@@ -82,18 +98,32 @@
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
readonly
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
></el-input>
</el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
readonly
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col>
@@ -190,10 +220,20 @@
label="合规">
<template slot-scope="scope">
<el-input
v-if="dataList[scope.$index].noCompliance && dataList[scope.$index].noCompliance.length>0
|| dataList[scope.$index].countermeasures && dataList[scope.$index].countermeasures.length>0
|| dataList[scope.$index].completionTime && dataList[scope.$index].completionTime !== null"
disabled
v-model="dataList[scope.$index].complianceReasons"
placeholder="请输入合规原因"
>
</el-input>
<el-input
v-else
v-model="dataList[scope.$index].complianceReasons"
placeholder="请输入合规原因"
>
</el-input>
</template>
</el-table-column>
<el-table-column
@@ -208,10 +248,18 @@
label="不合规项目">
<template slot-scope="scope">
<el-input
v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
disabled
v-model="dataList[scope.$index].noCompliance"
placeholder="请输入不合规项目"
>
</el-input>
<el-input
v-else
v-model="dataList[scope.$index].noCompliance"
placeholder="请输入不合规项目"
>
</el-input>
</template>
</el-table-column>
<el-table-column
@@ -221,22 +269,40 @@
label="应对措施">
<template slot-scope="scope">
<el-input
v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
disabled
v-model="dataList[scope.$index].countermeasures"
placeholder="请输入应对措施"
>
</el-input>
<el-input
v-else
v-model="dataList[scope.$index].countermeasures"
placeholder="请输入应对措施"
>
</el-input>
</template>
</el-table-column>
<el-table-column
prop="researchCompletionTime"
align="center"
width="120"
width="140"
label="完成时间">
<template slot-scope="scope">
<el-date-picker
v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
disabled
v-model="dataList[scope.$index].completionTime"
type="date"
placeholder="选择日期">
placeholder="请选择日期">
</el-date-picker>
<el-date-picker
v-else
class="datePickLen"
clearable
v-model="dataList[scope.$index].completionTime"
type="date"
placeholder="请选择日期">
</el-date-picker>
</template>
</el-table-column>
@@ -252,10 +318,20 @@
label="合规(具体情况)">
<template slot-scope="scope">
<el-input
v-if="dataList[scope.$index].zcNoCompliance && dataList[scope.$index].zcNoCompliance.length>0
|| dataList[scope.$index].zcCountermeasures && dataList[scope.$index].zcCountermeasures>0
|| dataList[scope.$index].zcCompletionTime && dataList[scope.$index].zcCompletionTime !== null"
disabled
v-model="dataList[scope.$index].zcComplianceReasons"
placeholder="请输入合规原因"
>
</el-input>
<el-input
v-else
v-model="dataList[scope.$index].zcComplianceReasons"
placeholder="请输入合规原因"
>
</el-input>
</template>
</el-table-column>
<el-table-column
@@ -269,10 +345,18 @@
label="不合规项目">
<template slot-scope="scope">
<el-input
v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"
disabled
v-model="dataList[scope.$index].zcNoCompliance"
placeholder="请输入不合规项目"
>
</el-input>
<el-input
v-else
v-model="dataList[scope.$index].zcNoCompliance"
placeholder="请输入不合规项目"
>
</el-input>
</template>
</el-table-column>
<el-table-column
@@ -282,22 +366,40 @@
label="应对措施">
<template slot-scope="scope">
<el-input
v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"
disabled
v-model="dataList[scope.$index].zcCountermeasures"
placeholder="请输入应对措施"
>
</el-input>
<el-input
v-else
v-model="dataList[scope.$index].zcCountermeasures"
placeholder="请输入应对措施"
>
</el-input>
</template>
</el-table-column>
<el-table-column
prop="productionCompletionTime"
align="center"
width="120"
width="140"
label="完成时间">
<template slot-scope="scope">
<el-date-picker
v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"
disabled
v-model="dataList[scope.$index].zcCompletionTime"
type="date"
placeholder="选择日期">
placeholder="请选择日期">
</el-date-picker>
<el-date-picker
v-else
class="datePickLen"
clearable
v-model="dataList[scope.$index].zcCompletionTime"
type="date"
placeholder="请选择日期">
</el-date-picker>
</template>
</el-table-column>
@@ -780,6 +882,16 @@ export default {
height: 100%;
}
}
.datePickLen {
/deep/ .el-icon-circle-close:before {
margin-left: -180px;
}
}
.input-jump {
/deep/.el-input__inner{
color: #409EFF;
}
}
}
.demo-drawer-content {
margin-top: 10px;
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+46 -11
View File
@@ -24,6 +24,7 @@
<el-col :span="24">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standNumber"
placeholder="请输入标准编号"
readonly
@@ -32,24 +33,39 @@
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
readonly
></el-input>
</el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col>
@@ -82,18 +98,32 @@
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
readonly
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
></el-input>
</el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
readonly
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col>
@@ -722,6 +752,11 @@ export default {
height: 100%;
}
}
.input-jump {
/deep/.el-input__inner{
color: #409EFF;
}
}
}
.demo-drawer-content {
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+46 -11
View File
@@ -24,6 +24,7 @@
<el-col :span="24">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standNumber"
placeholder="请输入标准编号"
readonly
@@ -32,24 +33,39 @@
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
readonly
></el-input>
</el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col>
@@ -82,18 +98,32 @@
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
readonly
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
></el-input>
</el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
readonly
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col>
@@ -712,6 +742,11 @@ export default {
height: 100%;
}
}
.input-jump {
/deep/.el-input__inner{
color: #409EFF;
}
}
}
.demo-drawer-content {
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+46 -11
View File
@@ -24,6 +24,7 @@
<el-col :span="24">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standNumber"
placeholder="请输入标准编号"
readonly
@@ -32,24 +33,39 @@
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
readonly
></el-input>
</el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col>
@@ -82,18 +98,32 @@
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
readonly
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
></el-input>
</el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
readonly
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col>
@@ -708,6 +738,11 @@ export default {
height: 100%;
}
}
.input-jump {
/deep/.el-input__inner{
color: #409EFF;
}
}
}
.demo-drawer-content {
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+82 -4
View File
@@ -132,10 +132,20 @@
label="合规">
<template slot-scope="scope">
<el-input
v-if="scope.row.noCompliance && scope.row.noCompliance.length>0
|| scope.row.countermeasures && scope.row.countermeasures.length>0
|| scope.row.completionTime && scope.row.completionTime !== null"
disabled
v-model="scope.row.complianceReasons"
placeholder="请输入合规原因"
>
</el-input>
<el-input
v-else
v-model="scope.row.complianceReasons"
placeholder="请输入合规原因"
>
</el-input>
</template>
</el-table-column>
<el-table-column
@@ -150,10 +160,18 @@
label="不合规项目">
<template slot-scope="scope">
<el-input
v-if="scope.row.complianceReasons && scope.row.complianceReasons.length>0"
disabled
v-model="scope.row.noCompliance"
placeholder="请输入不合规项目"
>
</el-input>
<el-input
v-else
v-model="scope.row.noCompliance"
placeholder="请输入不合规项目"
>
</el-input>
</template>
</el-table-column>
<el-table-column
@@ -163,22 +181,40 @@
label="应对措施">
<template slot-scope="scope">
<el-input
v-if="scope.row.complianceReasons && scope.row.complianceReasons.length>0"
disabled
v-model="scope.row.countermeasures"
placeholder="请输入应对措施"
>
</el-input>
<el-input
v-else
v-model="scope.row.countermeasures"
placeholder="请输入应对措施"
>
</el-input>
</template>
</el-table-column>
<el-table-column
prop="researchCompletionTime"
align="center"
width="120"
width="140"
label="完成时间">
<template slot-scope="scope">
<el-date-picker
v-if="scope.row.complianceReasons && scope.row.complianceReasons.length>0"
disabled
v-model="scope.row.completionTime"
type="date"
placeholder="选择日期">
placeholder="请选择日期">
</el-date-picker>
<el-date-picker
v-else
class="datePickLen"
clearable
v-model="scope.row.completionTime"
type="date"
placeholder="请选择日期">
</el-date-picker>
</template>
</el-table-column>
@@ -194,10 +230,20 @@
label="合规(具体情况)">
<template slot-scope="scope">
<el-input
v-if="scope.row.zcNoCompliance && scope.row.zcNoCompliance.length>0
|| scope.row.zcCountermeasures && scope.row.zcCountermeasures>0
|| scope.row.zcCompletionTime && scope.row.zcCompletionTime !== null"
disabled
v-model="scope.row.zcComplianceReasons"
placeholder="请输入合规原因"
>
</el-input>
<el-input
v-else
v-model="scope.row.zcComplianceReasons"
placeholder="请输入合规原因"
>
</el-input>
</template>
</el-table-column>
<el-table-column
@@ -211,10 +257,18 @@
label="不合规项目">
<template slot-scope="scope">
<el-input
v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"
disabled
v-model="scope.row.zcNoCompliance"
placeholder="请输入不合规项目"
>
</el-input>
<el-input
v-else
v-model="scope.row.zcNoCompliance"
placeholder="请输入不合规项目"
>
</el-input>
</template>
</el-table-column>
<el-table-column
@@ -224,22 +278,40 @@
label="应对措施">
<template slot-scope="scope">
<el-input
v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"
disabled
v-model="scope.row.zcCountermeasures"
placeholder="请输入应对措施"
>
</el-input>
<el-input
v-else
v-model="scope.row.zcCountermeasures"
placeholder="请输入应对措施"
>
</el-input>
</template>
</el-table-column>
<el-table-column
prop="productionCompletionTime"
align="center"
width="120"
width="140"
label="完成时间">
<template slot-scope="scope">
<el-date-picker
v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"
disabled
v-model="scope.row.zcCompletionTime"
type="date"
placeholder="选择日期">
placeholder="请选择日期">
</el-date-picker>
<el-date-picker
v-else
class="datePickLen"
clearable
v-model="scope.row.zcCompletionTime"
type="date"
placeholder="请选择日期">
</el-date-picker>
</template>
</el-table-column>
@@ -896,6 +968,12 @@ export default {
.accessStandardsAndRegulations {
height: 100%;
}
.datePickLen {
/deep/ .el-icon-circle-close:before {
margin-left: -180px;
}
}
}
.demo-drawer-content {
src/pages/processCenter/pages/newProcess/index.vue
+76 -1
View File
@@ -148,7 +148,7 @@
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="">
<el-col :span="size ? 6 : 8" v-btn-permission="'9d3775db9a76f37402e3e49f3e55e77e'">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('11')">
<div class="card-top">
@@ -166,6 +166,63 @@
</div>
</el-card>
</el-col>
<!-- &lt;!&ndash;严逸舟写的分割线&ndash;&gt;-->
<!-- <el-col :span="size ? 6 : 8" v-btn-permission="">-->
<!-- <el-card shadow="hover">-->
<!-- <div class="card-box" @click="handleCreateProcess('12')">-->
<!-- <div class="card-top">-->
<!-- <div class="card-top-left">-->
<!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<!-- </div>-->
<!-- <div class="card-top-right">-->
<!-- <div class="card-top-right-text">赵开耀的流程</div>-->
<!-- <div class="card-top-right-line"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- &lt;!&ndash; <div class="card-bottom">&ndash;&gt;-->
<!-- &lt;!&ndash; 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。&ndash;&gt;-->
<!-- &lt;!&ndash; </div>&ndash;&gt;-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </el-col>-->
<!-- <el-col :span="size ? 6 : 8" v-btn-permission="">-->
<!-- <el-card shadow="hover">-->
<!-- <div class="card-box" @click="handleCreateProcess('13')">-->
<!-- <div class="card-top">-->
<!-- <div class="card-top-left">-->
<!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<!-- </div>-->
<!-- <div class="card-top-right">-->
<!-- <div class="card-top-right-text">严逸舟的流程</div>-->
<!-- <div class="card-top-right-line"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- &lt;!&ndash; <div class="card-bottom">&ndash;&gt;-->
<!-- &lt;!&ndash; 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。&ndash;&gt;-->
<!-- &lt;!&ndash; </div>&ndash;&gt;-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </el-col>-->
<!-- <el-col :span="size ? 6 : 8" v-btn-permission="">-->
<!-- <el-card shadow="hover">-->
<!-- <div class="card-box" @click="handleCreateProcess('14')">-->
<!-- <div class="card-top">-->
<!-- <div class="card-top-left">-->
<!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<!-- </div>-->
<!-- <div class="card-top-right">-->
<!-- <div class="card-top-right-text">张宇欢的流程</div>-->
<!-- <div class="card-top-right-line"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- &lt;!&ndash; <div class="card-bottom">&ndash;&gt;-->
<!-- &lt;!&ndash; 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。&ndash;&gt;-->
<!-- &lt;!&ndash; </div>&ndash;&gt;-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </el-col>-->
<!-- &lt;!&ndash;严逸舟写的分割线&ndash;&gt;-->
</div>
</div>
<div v-if="zcgllc">
@@ -283,6 +340,24 @@ export default {
name:'xmqdqrStep1'
})
break
case '12':
// 赵开耀的流程
this.$router.push({
name: 'zhaokaiyaoStep1'
})
break
case '13':
// 严逸舟的流程
this.$router.push({
name: 'yanyizhouStep1'
})
break
case '14':
// 张宇欢的流程
this.$router.push({
name: 'zhangyuhuanStep1'
})
break
}
},
checkPermission(permissionIdArray) {