-
+
-
+
-
+
Date: Mon, 13 Dec 2021 14:24:46 +0800
Subject: [PATCH 05/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/xmpg2/step1-1.vue | 81 ++++++++++---------
.../pages/creatProcess/xmpg2/step1.vue | 81 ++++++++++---------
2 files changed, 82 insertions(+), 80 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
index 2f69511df..5ed40df6e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
@@ -598,47 +598,48 @@ export default {
})
if(!fileFlag){
this.$message.warning('请选择分解单来源')
+ }else{
+ if (this.listForm.dataList.length < 1) {
+ this.$message.warning("请选择带标准的项目");
+ } else {
+ this.listForm.commentText = this.commentText;
+ var json = Object.assign(this.listForm, this.roleForm);
+ json.prcCreateUser = this.$store.getters.userInfo.userId;
+ json.prcCreateUserName = this.$store.getters.userInfo.userName;
+ json.standId = this.listForm.standId;
+ this.$refs["listForm"].validate((valid) => {
+ if (valid) {
+ this.$refs["roleForm"].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true;
+ this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+ _this: this
+ }, res => {
+ if (res.ok) {
+ this.$http.post("lawss/activiti/completeTask", {
+ taskIds: res.data,
+ userId: this.$store.getters.userInfo.userId,
+ json: JSON.stringify(json)
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message);
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false;
+ });
+ }
+ });
+ } else {
+ return this.$message.warning("请完善人员信息");
+ }
+ });
+ } else {
+ return this.$message.warning("请完善基础信息");
+ }
+ });
}
- if (this.listForm.dataList.length < 1) {
- this.$message.warning("请选择带标准的项目");
- } else {
- this.listForm.commentText = this.commentText;
- var json = Object.assign(this.listForm, this.roleForm);
- json.prcCreateUser = this.$store.getters.userInfo.userId;
- json.prcCreateUserName = this.$store.getters.userInfo.userName;
- json.standId = this.listForm.standId;
- this.$refs["listForm"].validate((valid) => {
- if (valid) {
- this.$refs["roleForm"].validate((valid) => {
- if (valid) {
- this.isSubmit = true;
- this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
- _this: this
- }, res => {
- if (res.ok) {
- this.$http.post("lawss/activiti/completeTask", {
- taskIds: res.data,
- userId: this.$store.getters.userInfo.userId,
- json: JSON.stringify(json)
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message);
- this.$router.push("/processCenter");
- }
- this.isSubmit = false;
- });
- }
- });
- } else {
- return this.$message.warning("请完善人员信息");
- }
- });
- } else {
- return this.$message.warning("请完善基础信息");
- }
- });
}
},
choiceZRR(type, title, id) {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index ce0e2ae44..ccdd41aac 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -615,47 +615,48 @@ export default {
})
if(!fileFlag){
this.$message.warning('请选择分解单来源')
+ }else{
+ if (this.listForm.dataList.length < 1) {
+ this.$message.warning("请选择带标准的项目");
+ } else {
+ this.listForm.commentText = this.commentText;
+ var json = Object.assign(this.listForm, this.roleForm);
+ json.prcCreateUser = this.$store.getters.userInfo.userId;
+ json.prcCreateUserName = this.$store.getters.userInfo.userName;
+ json.standId = this.listForm.standId;
+ this.$refs["listForm"].validate((valid) => {
+ if (valid) {
+ this.$refs["roleForm"].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true;
+ this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+ _this: this
+ }, res => {
+ if (res.ok) {
+ this.$http.post("lawss/activiti/completeTask", {
+ taskIds: res.data,
+ userId: this.$store.getters.userInfo.userId,
+ json: JSON.stringify(json)
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message);
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false;
+ });
+ }
+ });
+ } else {
+ return this.$message.warning("请完善人员信息");
+ }
+ });
+ } else {
+ return this.$message.warning("请完善基础信息");
+ }
+ });
}
- if (this.listForm.dataList.length < 1) {
- this.$message.warning("请选择带标准的项目");
- } else {
- this.listForm.commentText = this.commentText;
- var json = Object.assign(this.listForm, this.roleForm);
- json.prcCreateUser = this.$store.getters.userInfo.userId;
- json.prcCreateUserName = this.$store.getters.userInfo.userName;
- json.standId = this.listForm.standId;
- this.$refs["listForm"].validate((valid) => {
- if (valid) {
- this.$refs["roleForm"].validate((valid) => {
- if (valid) {
- this.isSubmit = true;
- this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
- _this: this
- }, res => {
- if (res.ok) {
- this.$http.post("lawss/activiti/completeTask", {
- taskIds: res.data,
- userId: this.$store.getters.userInfo.userId,
- json: JSON.stringify(json)
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message);
- this.$router.push("/processCenter");
- }
- this.isSubmit = false;
- });
- }
- });
- } else {
- return this.$message.warning("请完善人员信息");
- }
- });
- } else {
- return this.$message.warning("请完善基础信息");
- }
- });
}
},
// 点击查看
From ef015e9efe3c6ebdf1d09763b31d8cd88d347032 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 13 Dec 2021 15:14:45 +0800
Subject: [PATCH 06/16]
feat: There is no way the,
---
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue | 1 +
src/pages/processCenter/pages/creatProcess/qbrk/step9.vue | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index 6a1c92983..d087c5262 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -646,6 +646,7 @@
v-show="verifySarStandard"
show-save
show-submit
+ :submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
index f6314e0e3..be38c88bc 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
@@ -1003,6 +1003,7 @@
},
loading: false,
drawerModal: false,
+ taskInfo:'标准法规部部长审核',
assigneeNewLoading: false,
disabledState: true,
userId:this.$store.getters.userInfo.userId,
From dbd1b054610bced53e9b4de5d95b2e22547a44e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 13 Dec 2021 15:16:55 +0800
Subject: [PATCH 07/16] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
=?UTF-8?q?=E6=95=B4=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/unqualProcess.js | 6 +-
.../pages/rectificationDatabase.vue | 101 +++++++++++-------
2 files changed, 63 insertions(+), 44 deletions(-)
diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js
index 229f11353..fd83b43bf 100644
--- a/src/api/unqualProcess.js
+++ b/src/api/unqualProcess.js
@@ -65,7 +65,7 @@ export function meetingByMonth(params) {
export function addUn(
closeState,standId, standSerialNumber, standName,
itemsNum, itemsName, productType,
- productLine, productName,productId,reason, responsibleUnit,
+ productLine, productName,productId,reason,
dutyEngineer, authEngineer, qaEngineer, planCloseTime) {
const data = {
closeState,
@@ -79,7 +79,6 @@ export function addUn(
productName, //项目名称
productId, //项目编号
reason, //不合规项目
- responsibleUnit, //责任部门
dutyEngineer, //责任工程师
authEngineer, //认证工程师
qaEngineer, //质量工程师
@@ -96,7 +95,7 @@ export function addUn(
export function editUn(
closeState, standId, standSerialNumber, standName,
itemsNum, itemsName, productType,
- productLine, productName, reason, responsibleUnit,
+ productLine, productName, reason,
dutyEngineer, authEngineer, qaEngineer, planCloseTime, id) {
const data = {
closeState,
@@ -109,7 +108,6 @@ export function editUn(
productLine, //产品线
productName, //项目名称
reason, //不合规项目
- responsibleUnit, //责任部门
dutyEngineer, //责任工程师
authEngineer, //认证工程师
qaEngineer, //质量工程师
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index e5eb602fd..2aa17ac83 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -250,7 +250,7 @@
{{ historySeeForm.responsibleUnit }}
- {{ historySeeForm.dutyEngineer }}
+ {{ historySeeForm.dutyEngineerName }}
{{ historySeeForm.authEngineer }}
@@ -418,8 +418,9 @@
@@ -487,14 +488,14 @@
placeholder="请输入项目编号"
/>
-
-
-
+
+
+
+
+
+
+
+
-
@@ -775,22 +776,22 @@ export default {
}, //表单数据
formRules: {
standSerialNumber: [
- { required: true, message: "请输入标准号", trigger: "blur" }
+ { required: true, message: "请输入标准号", trigger: "change" }
],
standName: [
- { required: true, message: "请输入标准名称", trigger: "blur" }
+ { required: true, message: "请输入标准名称", trigger: "change" }
+ ],
+ itemsNum: [
+ { required: true, message: "请输入条款号", trigger: "change" }
+ ],
+ itemsName: [
+ { required: true, message: "请输入条款名称", trigger: "change" }
],
- // itemsNum: [
- // { required: true, message: "请输入条款号", trigger: "blur" }
- // ],
- // itemsName: [
- // { required: true, message: "请输入条款名称", trigger: "blur" }
- // ],
productType: [
- { required: true, message: "请输入产品类型", trigger: "blur" }
+ { required: true, message: "请输入产品类型", trigger: "change" }
],
productLine: [
- { required: true, message: "请输入产品线", trigger: "blur" }
+ { required: true, message: "请输入产品线", trigger: "change" }
],
productName: [
{ required: true, message: "请输入项目名称", trigger: "change" }
@@ -799,16 +800,16 @@ export default {
{ required: true, message: "请输入项目编号", trigger: "change" }
],
reason: [
- { required: true, message: "请输入不合规项目", trigger: "blur" }
- ],
- responsibleUnit: [
- { required: true, message: "请输入责任部门", trigger: "blur" }
+ { required: true, message: "请输入不合规项目", trigger: "change" }
],
+ // responsibleUnit: [
+ // { required: true, message: "请输入责任部门", trigger: "change" }
+ // ],
dutyEngineerName: [
- { required: true, message: "请输入责任工程师", trigger: "blur" }
+ { required: true, message: "请输入责任工程师", trigger: "change" }
],
planCloseTime: [
- { required: true, message: "请选择计划关闭时间", trigger: "blur" }
+ { required: true, message: "请选择计划关闭时间", trigger: "change" }
]
},
drawerTable: false, //表单模态窗
@@ -907,15 +908,18 @@ export default {
},
//确认添加标准
okStand(){
- if(this.standList > 1){
+ if(this.standList.length > 1){
this.$message.warning('您只能选择一条标准进行添加')
- }else if(this.standList < 1){
+ }else if(this.standList.length < 1){
this.$message.warning('请至少选择一条数据进行添加')
}else{
this.addForm.standId = this.standList[0].id
this.addForm.standName = this.standList[0].standName
this.addForm.standSerialNumber = this.standList[0].standSort + '-' + this.standList[0].standNumber + '-' + this.standList[0].standYear
this.dialogTableVisible = false
+ if(this.addForm.standName){
+ this.$refs.addForm.validateField('standName');
+ }
}
},
//添加标准select的改变
@@ -1094,7 +1098,7 @@ export default {
const productName = this.addForm.productName;
const productId = this.addForm.productId;
const reason = this.addForm.reason;
- const responsibleUnit = this.addForm.responsibleUnit;
+ // const responsibleUnit = this.addForm.responsibleUnit;
const dutyEngineer = this.addForm.dutyEngineer;
const authEngineer = this.addForm.authEngineer;
const qaEngineer = this.addForm.qaEngineer;
@@ -1107,7 +1111,7 @@ export default {
closeState, standId, standSerialNumber,
standName, itemsNum, itemsName, productType,
productLine, productName, productId,reason,
- responsibleUnit, dutyEngineer,
+ dutyEngineer,
authEngineer, qaEngineer, planCloseTime).then(res => {
if (res.ok) {
this.submiting = false
@@ -1128,7 +1132,7 @@ export default {
editUn(
closeState, standId, standSerialNumber,
standName, itemsNum, itemsName, productType,
- productLine, productName, reason, responsibleUnit,
+ productLine, productName, reason,
dutyEngineer, authEngineer, qaEngineer,
planCloseTime, id).then(res => {
if (res.ok) {
@@ -1197,8 +1201,8 @@ export default {
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", {
standType: this.standardSearch.standType,
standNumber: this.standardSearch.standNumber,
- page: this.pageNo,
- pageSize: this.pageSizeNo
+ page: this.page,
+ pageSize: this.pageSize
}, {
_this: this
}, res => {
@@ -1258,13 +1262,24 @@ export default {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
- id: item.standId,
- pageType: "FOREIGN_STAND"
- // pageType: item.standType + '_STAND'
+ id: item.id,
+ pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank");
},
+ // 点击查看
+ // handlePreview(item) {
+ // let routeUrl = this.$router.resolve({
+ // name: "OtherStandardDetails",
+ // params: {
+ // id: item.standId,
+ // pageType: "FOREIGN_STAND"
+ // // pageType: item.standType + '_STAND'
+ // }
+ // });
+ // window.open(routeUrl.href, "_blank");
+ // },
detailsStandard(item) {
this.$http.post("lawss/sarTestItem/validateStandNumber", {
standNumber: item.standNum
@@ -1341,7 +1356,13 @@ export default {
this.roleShowflag = true
},
drawerCheck(data) {
- this.addForm.dutyEngineer = data[0].name
+ // this.addForm.dutyEngineer = data[0].id
+ // this.addForm.dutyEngineerName = data[0].name
+ this.$set(this.addForm, 'dutyEngineer', data[0].id)
+ this.$set(this.addForm, 'dutyEngineerName', data[0].name)
+ if(this.addForm.dutyEngineerName){
+ this.$refs.addForm.validateField('dutyEngineerName');
+ }
this.roleShowflag = false
},
/** 选择认证工程师和质量工程师 */
From fa799b708affaa35486630dff314262a2584a12a Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 13 Dec 2021 15:46:48 +0800
Subject: [PATCH 08/16] =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E8=A1=A8=E6=A0=BC?=
=?UTF-8?q?=E4=BC=9A=E6=8A=96=E6=89=80=E4=BB=A5=E5=8F=96=E6=B6=88=E4=BA=86?=
=?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E5=88=86=E9=A1=B5=E5=8A=A0=E8=BD=BD?=
=?UTF-8?q?=E9=9A=90=E8=97=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../accessStandardsAndRegulations/page/listTracking.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
index bad3cc6e5..bb9dec62c 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
@@ -712,7 +712,6 @@
Date: Mon, 13 Dec 2021 16:07:32 +0800
Subject: [PATCH 09/16] =?UTF-8?q?=E9=87=8D=E7=82=B9=E6=B8=85=E5=8D=95=20?=
=?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
=?UTF-8?q?=E4=B8=89=E4=B8=AA=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=EF=BC=8C?=
=?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=AF=E5=A4=9A=E4=B8=AA=EF=BC=8C=E7=9B=AE?=
=?UTF-8?q?=E5=89=8D=E5=8F=AA=E6=98=BE=E7=A4=BA=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../page/listTracking.vue | 82 +++++++++++--------
1 file changed, 50 insertions(+), 32 deletions(-)
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
index bb9dec62c..ba646789c 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
@@ -361,8 +361,8 @@
width="120"
label="发布日期">
- {{ formatIssueDate(scope.row.issueTime) }}
- {{ formatIssueDate(scope.row.issueTime) }}
+ {{ scope.row.issueTime }}
+ {{ scope.row.issueTime }}
- {{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}
- {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}
+ {{ scope.row.ssrq }}
+ {{ scope.row.ssrq }}
@@ -384,8 +384,8 @@
width="150"
label="新车型实施日期">
- {{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}
- {{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}
+ {{ scope.row.xcxssrq }}
+ {{ scope.row.xcxssrq }}
- {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}
- {{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}
+ {{ scope.row.zccssrq }}
+ {{ scope.row.zccssrq }}
+
+
+ {{
+ scope.row.standEnName
+ }}
+ {{
+ scope.row.standEnName
+ }}
+ {{
+ scope.row.standEnName
+ }}
+
+
- {{ formatIssueDate(scope.row.issueTime) }}
+ {{ scope.row.issueTime }}
- {{ formatIssueDate(scope.row.issueTime) }}
+ {{ scope.row.issueTime }}
- {{ formatIssueDate(scope.row.issueTime) }}
+ {{ scope.row.issueTime }}
@@ -480,12 +498,12 @@
{{
- scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-'
+ scope.row.ssrq
}}
{{
- scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-'
+ scope.row.ssrq
}}
- {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}
+ {{ scope.row.ssrq}}
@@ -496,13 +514,13 @@
label="新车型实施日期">
{{
- scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-'
+ scope.row.xcxssrq
}}
{{
- scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-'
+ scope.row.xcxssrq
}}
{{
- scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-'
+ scope.row.xcxssrq
}}
@@ -513,13 +531,13 @@
label="在产车实施日期">
{{
- scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-'
+ scope.row.zccssrq
}}
{{
- scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-'
+ scope.row.zccssrq
}}
{{
- scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-'
+ scope.row.zccssrq
}}
@@ -588,9 +606,9 @@
width="120"
>
- {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
- {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
- {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
+ {{scope.row.issueTime }}
+ {{scope.row.issueTime }}
+ {{scope.row.issueTime }}
- {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
- {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
- {{scope.row.XCXSSRQLAWS ? scope.row.XCXSSRQLAWS.slice(0, 10) : ''}}
+ {{scope.row.putTime }}
+ {{scope.row.putTime }}
+ {{scope.row.XCXSSRQLAWS }}
- {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
- {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
- {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
+ {{scope.row.issueTime }}
+ {{scope.row.issueTime }}
+ {{scope.row.issueTime }}
- {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
- {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
- {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
+ {{scope.row.putTime }}
+ {{scope.row.putTime }}
+ {{scope.row.putTime }}
Date: Mon, 13 Dec 2021 16:10:25 +0800
Subject: [PATCH 10/16] =?UTF-8?q?=E9=87=8D=E7=82=B9=E6=B8=85=E5=8D=95=20?=
=?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
=?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD=E5=A4=B1=E6=95=88=EF=BC=88?=
=?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=8E=BB=E6=8E=89=E6=8E=92=E5=BA=8F=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../page/listTracking.vue | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
index ba646789c..fcf1e5d97 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
@@ -357,7 +357,6 @@
@@ -367,7 +366,6 @@
@@ -380,7 +378,6 @@
@@ -390,7 +387,6 @@
@@ -400,7 +396,6 @@
@@ -475,7 +470,6 @@
@@ -492,7 +486,6 @@
@@ -509,7 +502,6 @@
@@ -526,7 +518,6 @@
@@ -543,7 +534,6 @@
@@ -602,7 +592,6 @@
@@ -614,7 +603,6 @@
@@ -625,7 +613,6 @@
@@ -696,7 +682,6 @@
@@ -707,7 +692,6 @@
Date: Mon, 13 Dec 2021 16:29:22 +0800
Subject: [PATCH 11/16] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AF=84=E4=BB=B7=20?=
=?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B9=8B=E5=90=8E=E6=A8=A1=E6=80=81=E6=A1=86?=
=?UTF-8?q?=E6=94=B6=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/details/otherBussStandardDetails/index.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 3258600ba..99f3d6e89 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -1761,6 +1761,7 @@ export default {
}, res => {
if (res.ok){
this.$message.success('提交成功')
+ this.businessCommentDialog = false
this.commentSubmitLoading = false
//重新评分之后刷新历史评分人
let standId = this.$route.params.id
From 4507279bf82ddd660b91c525eb47cd9677aa0f89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 13 Dec 2021 16:56:27 +0800
Subject: [PATCH 12/16] =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=80=89=E4=BA=BA?=
=?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../nonConfomity/pages/rectificationDatabase.vue | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 2aa17ac83..7e03d00a3 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -1368,7 +1368,9 @@ export default {
/** 选择认证工程师和质量工程师 */
choiceMore(type, title, id) {
this.nodeListMore = []
- this.nodeListMore.push(id)
+ if(id){
+ this.nodeListMore.push(id)
+ }
this.type = type
this.titleMore = title
this.roleShowMore = true
@@ -1386,6 +1388,7 @@ export default {
})
if (this.type === 'authEngineer') {
this.addForm.authEngineer = nameList
+ console.log(this.addForm.authEngineer);
} else {
this.addForm.qaEngineer = nameList
}
From 0a124618bb59c222b962c5ef9f61c3cdc557f678 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 13 Dec 2021 17:12:50 +0800
Subject: [PATCH 13/16] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AF=84=E4=BB=B7=20-?=
=?UTF-8?q?=20=E5=8F=B3=E4=B8=8A=E8=A7=92=E6=80=BB=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../otherBussStandardDetails/index.vue | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 99f3d6e89..4bb1ef841 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -4,6 +4,7 @@
@@ -1778,6 +1779,15 @@ export default {
}, e => {
})
+ //刷新动态评价总平均分和质量评价总平均分
+ this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
+ _this: this
+ }, res => {
+ this.qualityCommentScore = res.data.quality.toFixed(3)/2
+ this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2
+
+ }, e => {
+ })
}
}, e => {
})
@@ -2858,7 +2868,17 @@ export default {
// }
},
async mounted () {
+ //查询动态评价总平均分和质量评价总平均分
let standId = this.$route.params.id
+ this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
+ _this: this
+ }, res => {
+ this.qualityCommentScore = res.data.quality.toFixed(3)/2
+ this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2
+
+ }, e => {
+ })
+ //查询评价人表
const qualityRequest = {
lawId: standId,
evaluationType: 'quality'
From d4735e5ed845313f6108e90a71e287af9a0e23f9 Mon Sep 17 00:00:00 2001
From: shenyanpei
Date: Mon, 13 Dec 2021 17:26:38 +0800
Subject: [PATCH 14/16] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=8F=E8=83=8C?=
=?UTF-8?q?=E6=99=AF=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/navMenu/index.vue | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 09c1e0610..e9e9b928e 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -16,7 +16,7 @@
Date: Mon, 13 Dec 2021 17:49:13 +0800
Subject: [PATCH 15/16] =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E5=8F=98=E6=B5=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/static/pdf/web/viewer.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/static/pdf/web/viewer.js b/public/static/pdf/web/viewer.js
index 47d3d46bc..519ad58a0 100644
--- a/public/static/pdf/web/viewer.js
+++ b/public/static/pdf/web/viewer.js
@@ -6653,7 +6653,7 @@ var PDFPageView = function () {
watermark_cols: 0,//水印列数
watermark_x_space: 18,//水印x轴间隔
watermark_y_space: 20,//水印y轴间隔
- watermark_color: 'rgba(192, 192, 192)',//水印字体颜色
+ watermark_color: 'rgba(232,232,240)',//水印字体颜色
watermark_alpha: 0.3,//水印透明度
watermark_fontsize: '40px',//水印字体大小
watermark_font: '微软雅黑',//水印字体
@@ -6671,7 +6671,7 @@ var PDFPageView = function () {
watermark_cols: 0,//水印列数
watermark_x_space: 2,//水印x轴间隔
watermark_y_space: 27,//水印y轴间隔
- watermark_color: 'rgba(192, 192, 192)',//水印字体颜色
+ watermark_color: 'rgba(232,232,240)',//水印字体颜色
watermark_alpha: 0.3,//水印透明度
watermark_fontsize: '40px',//水印字体大小
watermark_font: '微软雅黑',//水印字体
From f6ec7bbfa0af18081512f7e54b6d17637914035f Mon Sep 17 00:00:00 2001
From: zhutianqi
Date: Mon, 13 Dec 2021 17:57:03 +0800
Subject: [PATCH 16/16] commit
---
.../pages/creatProcess/bzzqyj/step1-1.vue | 176 ++-
.../pages/creatProcess/bzzqyj/step1.vue | 178 ++-
.../pages/creatProcess/bzzqyj/step2.vue | 24 +-
.../pages/creatProcess/bzzqyj/step3.vue | 1064 ++++++++++-------
.../pages/creatProcess/bzzqyj/step4.vue | 40 +-
.../tabComponents/processCenter/index.vue | 6 +-
.../domesticStandardsAndRegulations/index.vue | 2 +-
7 files changed, 1004 insertions(+), 486 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
index 7cb9d901e..c82eb09dd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
@@ -56,6 +56,28 @@
+
+
+
+
+
+ 点击上传
+
+
+
@@ -97,12 +119,12 @@
- 责任领导
+ 责任部门对接人
@@ -253,7 +275,7 @@
+
+
+
+
+
@@ -311,6 +353,9 @@ export default {
name: "bzzqyjStep1-1",
data() {
return {
+ fileUrl: 'api/att/attFile/upload',
+ fileMadel: false,
+ OCRoptions: [],
addFjList: [],
fzShow: false,
fzlistModel: false,
@@ -330,7 +375,11 @@ export default {
standType: '',
standId: '',
fjList: [],
- fjListId: ''
+ fjListId: '',
+ fjListId: '',
+ textType: '',
+ modelList: [],
+ modelNameList: ''
},
formRules: {
cid: [
@@ -401,6 +450,11 @@ export default {
ProcessTitle
},
mounted() {
+ this.$http.get('lawss/sarStandAttrDetails/getListData', '', {
+ _this: this
+ }, res => {
+ this.OCRoptions = res.data
+ })
this.getData()
this.sarStandCompareHis()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
@@ -415,6 +469,78 @@ export default {
}
},
methods: {
+ beginImportFile (file) {
+ var filename = file.name
+ var index1 = filename.lastIndexOf('.')
+ var index2 = filename.length
+ var fileSuffix = filename.substring(index1, index2)
+ // const fileSuffix = file.name.split('.')[1] // 后缀名
+ // 判断上传文件格式
+ if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+ return true
+ } else {
+ this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS文件')
+ return false
+ }
+ // 判断文件上传大小
+ // eslint-disable-next-line no-unreachable
+ if (file.size / 1024 / 1024 <= 200) {
+ return true
+ } else {
+ this.$message.error('文件' + file.name + '大小不超过200M')
+ return false
+ }
+ return true
+ },
+ importFileRemove (file, fileList) {
+ let list = ''
+ this.form.modelList = []
+ fileList.forEach(item => {
+ this.form.modelList.push(item)
+ if (list.length > 0) {
+ list += ','
+ list += item.name
+ } else {
+ list+= item.name
+ }
+ })
+ this.form.modelNameList = list
+ },
+ // 导入标准数据成功后执行
+ importFileSuccess (response, file) {
+ if (response.ok) {
+ this.form.modelList.push(response.data)
+ let list = ''
+ this.form.modelList.forEach(item => {
+ if (list.length > 0) {
+ list += ','
+ list += item.name
+ } else {
+ list+= item.name
+ }
+ })
+ this.form.modelNameList = list
+ this.$message({
+ showClose: true,
+ message: response.message,
+ type: 'success'
+ })
+ } else {
+ this.$message.error('程序异常,上传失败')
+ }
+ },
+ fileUpload () {
+ this.fileMadel = true
+ },
+ setWBType(type) {
+ let text = ''
+ for (let a = 0; a < this.OCRoptions.length; a++) {
+ if (this.OCRoptions[a].attrField === type) {
+ text = this.OCRoptions[a].attrName
+ }
+ }
+ return text
+ },
updataFj(item) {
let id
let type = item.fileName.split('.')
@@ -426,15 +552,36 @@ export default {
window.open('/static/pdf/phone/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
},
addfjList() {
- this.$http.get('lawss/sarStandFile/queryFileInfo', {
+ this.$http.get('lawss/sarStandFile/queryFileInfoNew', {
+ type: '0',
standId: this.form.standId
- }, {}, res => {
- this.fjList = res.data
+ }, {
+ _this: this
+ }, res => {
+ this.OCRLoading = false
+ if (res.ok) {
+ if (res.data.length > 0) {
+ this.fjList = res.data
+ this.fzlistModel = true
+ } else {
+ this.$message.warning('当前标准没有' + text + '文件')
+ this.fjList = []
+ }
+ }
})
- this.fzlistModel = true
+ // this.$http.get('lawss/sarStandFile/queryFileInfo', {
+ // standId: this.form.standId
+ // }, {}, res => {
+ // this.fjList = res.data
+ // this.fzlistModel = true
+ // })
},
handleSelection2(data) {
- this.addFjList = data
+ if (data.length > 1) {
+ this.$message.warning('最多选择1条附件')
+ } else {
+ this.addFjList = data
+ }
},
closeDrawer2() {
this.fzlistModel = false
@@ -443,11 +590,16 @@ export default {
enterDrawer2() {
this.fzlistModel = false
this.form.fjList = this.addFjList
- let idList
+ this.form.textType = this.setWBType(this.addFjList[0].standFileClassify)
+ this.form.textValue = this.addFjList[0].standFileClassify
+ let idList = []
+ let nameList = []
this.addFjList.forEach(item => {
- idList += item.id + ','
+ idList.push(item.id)
+ nameList.push(item.fileName)
})
- this.form.fjListId = idList
+ this.form.fjListName = nameList.join(',')
+ this.form.fjListId = idList.join(',')
},
// 点击查看
handlePreview(item) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index d78716bf4..adb01fa52 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -56,6 +56,34 @@