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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-03-03 15:45:54 +08:00
parent 88bff9ed10 23bda279d7
commit 5bfe05beb7
41 changed files with 1177 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+1 -1
View File
@@ -355,7 +355,7 @@
</el-input>
</div>
</el-form-item>
<el-form-item label="是否采用标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="isRelate" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-form-item label="采用国内外标准情况" style="width: 100%; margin-right:10px" class="add-form-item" prop="isRelate" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
<el-radio-group :disabled="DrawerType === 'see'" v-model="addForm.isRelate">
<el-radio label="是" value="是"></el-radio>
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+1 -1
View File
@@ -190,7 +190,7 @@
label="标准名称">
</el-table-column>
<el-table-column
v-if="sarProject.position === '1'"
v-if="sarProject.position === '1' && !itemType"
prop="lastVersionNumber"
label="上一版本标准编号">
</el-table-column>
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+3 -39
View File
@@ -170,18 +170,6 @@
width="100"
label="责任工程师">
</el-table-column>
<el-table-column
prop="authEngineer"
width="150"
show-overflow-tooltip
label="认证工程师">
</el-table-column>
<el-table-column
prop="qaEngineer"
width="150"
show-overflow-tooltip
label="质量工程师">
</el-table-column>
<el-table-column
prop="planCloseTime"
width="150"
@@ -255,12 +243,6 @@
<el-form-item class="add-form-item" label="责任工程师:">
<div class="seeItem">{{ historySeeForm.dutyEngineerName }}</div>
</el-form-item>
<el-form-item class="add-form-item" label="认证工程师:">
<div class="seeItem">{{ historySeeForm.authEngineer }}</div>
</el-form-item>
<el-form-item class="add-form-item" label="质量工程师:">
<div class="seeItem">{{ historySeeForm.qaEngineer }}</div>
</el-form-item>
<el-form-item class="add-form-item" label="整改完成时间:">
<div class="seeItem">
{{ historySeeForm.planCloseTime ? historySeeForm.planCloseTime.substring(0, 11) : "-" }}
@@ -514,22 +496,6 @@
@click.native="choiceZRR"
/>
</el-form-item>
<el-form-item prop="authEngineer" label="认证工程师" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
v-model="addForm.authEngineer"
placeholder="请输入认证工程师"
@click.native="choiceMore('authEngineer','选择认证工程师',addForm.authEngineer)"
/>
</el-form-item>
<el-form-item prop="qaEngineer" label="质量工程师" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
v-model="addForm.qaEngineer"
placeholder="请输入质量工程师"
@click.native="choiceMore('qaEngineer','选择质量工程师',addForm.qaEngineer)"
/>
</el-form-item>
<el-form-item prop="planCloseTime" label="整改完成时间" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-date-picker
@@ -773,17 +739,15 @@ export default {
reason: "", //不合规项目
responsibleUnit: "", //责任部门
dutyEngineer: "", //责任工程师
authEngineer: "", //认证工程师
qaEngineer: "", //质量工程师
planCloseTime: "" //整改完成时间
}, //表单数据
formRules: {
standSerialNumber: [
{ required: true, message: "请输入标准号", trigger: "change" }
],
standName: [
{ required: true, message: "请输入标准名称", trigger: "change" }
],
// standName: [
// { required: true, message: "请输入标准名称", trigger: "change" }
// ],
itemsNum: [
{ required: true, message: "请输入条款号", trigger: "change" }
],