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:
zhutianqi
2021-12-01 17:58:14 +08:00
parent f2e520ae0e 7cd02658fb
commit 47e8e749ec
11 changed files with 313 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+3 -2
View File
@@ -510,12 +510,12 @@
</el-form-item>
<el-form-item
label="企标编号"
prop="standCode"
prop="standNumber"
label-width="150px"
class="add-form-item"
>
<el-input
v-model="sarBussionessStandEO.standCode"
v-model="sarBussionessStandEO.standNumber"
:maxlength="100"
placeholder="请输入企标编号"
clearable
@@ -2993,6 +2993,7 @@ export default {
if (nowstandinfo.firstPutTime != null && nowstandinfo.firstPutTime !== '') {
nowstandinfo.firstPutTime = this.$dateFormat(this.sarBussionessStandEO.firstPutTime, 'yyyy-MM-dd hh:mm:ss')
}
nowstandinfo.standCode = nowstandinfo.standSort + ' ' + nowstandinfo.standNumber + ( nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
this.$http.postData('lawss/sarBussionessStand/updateSarBussionessStand', nowstandinfo, {
_this: this,
loading: 'isSubmit'
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+5 -5
View File
@@ -932,14 +932,14 @@
:disabled="formdisableflag"
></custom-SVPPS>
</template>
<template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ'">
<custom-date-pick
<template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ' || field.attrField === 'SSRQ'">
<custom-date-pick-group
v-if="field.attrField !== 'ZCCSSRQGJ' && field.attrField !== 'XCXSSRQGJ' && field.attrField !== 'SSRQGJ' "
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-date-pick>
></custom-date-pick-group>
</template>
<template v-else-if="field.attrType === 'DATE_PIC_OPTS'">
<custom-date-pick-group
@@ -4894,14 +4894,14 @@ export default {
let idList = ''
let nameList = ''
data.forEach(item => {
if (item.hasChild === '0' && item.children === null) {
// if (item.hasChild === '0' && item.children === null) {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
}
// }
})
this.sarStandardsInfoEO.ZRBMId = idList;
this.sarStandardsInfoEO['ZRBM'] = nameList;
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+72 -21
View File
@@ -115,7 +115,7 @@
<el-table-column
prop="standName"
fixed="left"
width="180"
width="200"
show-overflow-tooltip
label="标准名称">
<template slot-scope="scope">
@@ -124,7 +124,7 @@
</el-table-column>
<el-table-column
prop="itemsNum"
width="180"
width="75"
label="条款号">
</el-table-column>
<el-table-column
@@ -135,12 +135,8 @@
</el-table-column>
<el-table-column
prop="productType"
width="180"
width="100"
label="产品类型">
<!-- <template slot-scope="scope">
<div v-if="scope.row.productType === 'research'">在研</div>
<div v-if="scope.row.productType === 'product'">在产</div>
</template>-->
</el-table-column>
<el-table-column
prop="productLine"
@@ -161,11 +157,12 @@
<el-table-column
prop="responsibleUnit"
width="180"
show-overflow-tooltip
label="责任部门">
</el-table-column>
<el-table-column
prop="dutyEngineer"
width="150"
width="100"
label="责任工程师">
</el-table-column>
<el-table-column
@@ -428,6 +425,14 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item prop="projectNumber" label="项目编号" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
:disabled="true"
v-model="addForm.projectNumber"
placeholder="请输入项目编号"
/>
</el-form-item>
<el-form-item prop="productType" label="产品类型" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
@@ -486,9 +491,9 @@
<el-form-item prop="responsibleUnit" label="责任部门" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
:disabled="true"
v-model="addForm.responsibleUnit"
placeholder="请输入责任部门"
@click.native="choiceZRBM"
/>
</el-form-item>
<el-form-item prop="reason" label="不合规项目" style="width: 100%; margin-right:10px"
@@ -543,6 +548,7 @@
class="common-button-primary"
icon="el-icon-check"
type="primary"
:loading="submiting"
@click="submit">提交
</el-button>
<el-button
@@ -566,6 +572,12 @@
:nodeList="nodeListMore"
@checkedRole="drawerMore"
/>
<MechanismTree
is-title="选择部门信息"
:is-visible.sync="modalshowflagZRBM"
:nodeList="nodeListZRBM"
@checkedRole="drawerCheckZRBM"
/>
</div>
</template>
@@ -599,6 +611,7 @@ export default {
itemsNum: "", //条款号
itemsName: "", //条款名称
productType: "",
projectNumber: "",
productLine: "", //产品线
productName: "", //项目名称
reason: "", //不合规项目
@@ -615,12 +628,12 @@ export default {
standName: [
{ required: true, message: "请输入标准名称", trigger: "blur" }
],
itemsNum: [
{ required: true, message: "请输入条款号", trigger: "blur" }
],
itemsName: [
{ required: true, message: "请输入条款名称", trigger: "blur" }
],
// itemsNum: [
// { required: true, message: "请输入条款号", trigger: "blur" }
// ],
// itemsName: [
// { required: true, message: "请输入条款名称", trigger: "blur" }
// ],
productType: [
{ required: true, message: "请输入产品类型", trigger: "blur" }
],
@@ -630,6 +643,9 @@ export default {
productName: [
{ required: true, message: "请输入项目名称", trigger: "change" }
],
projectNumber: [
{ required: true, message: "请输入项目编号", trigger: "change" }
],
reason: [
{ required: true, message: "请输入不合规项目", trigger: "blur" }
],
@@ -671,12 +687,19 @@ export default {
// 新增编辑框的disabled
serialNumber: true,
// 提交按钮loading
submiting: false,
// 选择人（单选）
roleShowflag: false,
nodeList: [],
// 选择人（多选）
titleMore: '',
nodeListMore: [],
roleShowMore: false,
// 选择责任部门
nodeListZRBM: [],
modalshowflagZRBM: false
};
},
methods: {
@@ -877,6 +900,7 @@ export default {
const productType = this.addForm.productType;
const productLine = this.addForm.productLine;
const productName = this.addForm.productName;
const productId = this.addForm.projectNumber;
const reason = this.addForm.reason;
const responsibleUnit = this.addForm.responsibleUnit;
const dutyEngineer = this.addForm.dutyEngineer;
@@ -886,13 +910,15 @@ export default {
if (this.drawerTitle === "新增") {
this.$refs["addForm"].validate((valid) => {
if (valid) {
this.submiting = true
addUn(
closeState, standId, standSerialNumber,
standName, itemsNum, itemsName, productType,
productLine, productName, reason,
productLine, productName, productId,reason,
responsibleUnit, dutyEngineer,
authEngineer, qaEngineer, planCloseTime).then(res => {
if (res.ok) {
this.submiting = false
this.$message.success("新增成功");
this.drawerTable = false;
this.getTableByPage();
@@ -900,11 +926,13 @@ export default {
});
} else {
this.$message.warning("请完善基础信息");
this.submiting = false
}
});
} else {
this.$refs["addForm"].validate((valid) => {
if (valid) {
this.submiting = true
editUn(
closeState, standId, standSerialNumber,
standName, itemsNum, itemsName, productType,
@@ -912,6 +940,7 @@ export default {
dutyEngineer, authEngineer, qaEngineer,
planCloseTime, id).then(res => {
if (res.ok) {
this.submiting = false
this.$message.success("编辑成功");
this.drawerTable = false;
this.getTableByPage();
@@ -919,6 +948,7 @@ export default {
});
} else {
this.$message.warning("请完善基础信息");
this.submiting = false
}
});
}
@@ -954,7 +984,7 @@ export default {
}
});
this.dataList = res.data.records;
this.dataList.forEach(item => {
/*this.dataList.forEach(item => {
// 责任部门转换
if (item.zrbm !== null || item.zrbm !== "") {
let k = (item.zrbm || "").split(",");
@@ -967,7 +997,7 @@ export default {
}
}
}
});
});*/
});
},
//新增事件
@@ -1063,12 +1093,13 @@ export default {
/** 项目名称change事件 */
handleChange(val) {
console.log(val);
if (this.drawerTitle === '编辑') {
this.addForm.standName = ''
this.addForm.standSerialNumber = ''
this.addForm.responsibleUnit = ''
}
this.addForm.productId = val.id
this.addForm.projectNumber = val.projectNumber
this.addForm.productLine = val.productLine
this.addForm.productName = val.projectName
this.addForm.productType = val.projectPlatfor
@@ -1080,7 +1111,6 @@ export default {
standChange(item) {
this.addForm.standName = item.standName
this.addForm.standSerialNumber = item.standSort + '-' + item.standNumber + '-' + item.standYear
this.addForm.responsibleUnit = item.zrbm || "--";
},
/** 责任工程师选择 */
choiceZRR(type, title, id) {
@@ -1120,6 +1150,27 @@ export default {
this.roleShowMore = true
},
/** 选择责任部门 */
choiceZRBM(type, title, id) {
this.nodeListZRBM = []
this.nodeListZRBM.push(id)
this.modalshowflagZRBM = true
},
drawerCheckZRBM(data) {
let idList = ''
let nameList = ''
data.forEach(item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
})
this.addForm.responsibleUnit = nameList;
},
},
mounted() {
//查询已维护的项目