diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue
index f21179876..7f43379ab 100644
--- a/src/components/CustomFormComponents/File.vue
+++ b/src/components/CustomFormComponents/File.vue
@@ -95,7 +95,7 @@ export default {
allowType: {
type: Array,
default: () => {
- return ['.pdf', '.PDF', '.doc','.DOC', '.docx','.DOCX', '.pptx', '.PPTX', '.ppt', '.PPT', '.jpg','.JPG','.jpeg','.JPEG', '.PNG', '.png', '.xls','.XLS', '.xlsx','.XLSX']
+ return ['.pdf', '.PDF', '.doc','.DOC', '.docx','.DOCX', '.pptx', '.PPTX', '.ppt', '.PPT', '.xls','.XLS', '.xlsx','.XLSX']
}
},
// 栅格比例
diff --git a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
index a4993dac7..1cce90a58 100644
--- a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
+++ b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
@@ -35,17 +35,17 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue
index b8c79cdbc..98d193cec 100644
--- a/src/pages/config/pages/roleManage/index.vue
+++ b/src/pages/config/pages/roleManage/index.vue
@@ -146,7 +146,7 @@
-
+
-
+
-
+
-
+
{{ sarStandardsInfoEO.standStatusShow || '-' }}
+ >文本状态{{ sarStandardsInfoEO.standStatusShow || '-' }}
{{ sarStandardsInfoEO.issueTime || '-' }}
{{ sarStandardsInfoEO.putTime || '-' }}
diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index a290cf84a..8e4f32a12 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -89,14 +89,6 @@
-
- FCA
- HEV
- 纯电动
- 传统车
- 混动
- 柴油
-
@@ -105,7 +97,7 @@
- {{ scope.row.dutyEngineer }}
+ {{ scope.row.dutyEngineer }}
@@ -160,14 +152,6 @@
-
- FCA
- HEV
- 纯电动
- 传统车
- 混动
- 柴油
-
@@ -176,7 +160,7 @@
- {{ scope.row.dutyEngineer }}
+ {{ scope.row.dutyEngineer }}
@@ -216,14 +200,14 @@
{{ scope.row.standName }}
-
+
- {{ scope.row.itemsId }}
+ {{ scope.row.itemsNum }}
- {{ scope.row.itemsName }}
+ {{ scope.row.itemsName }}
@@ -232,14 +216,6 @@
-
- FCA
- HEV
- 纯电动
- 传统车
- 混动
- 柴油
-
@@ -249,7 +225,7 @@
- {{ scope.row.dutyEngineer }}
+ {{ scope.row.dutyEngineer }}
@@ -289,14 +265,14 @@
{{ scope.row.standName }}
-
+
- {{ scope.row.itemsId }}
+ {{ scope.row.itemsNum }}
- {{ scope.row.itemsName }}
+ {{ scope.row.itemsName }}
@@ -305,14 +281,6 @@
-
- FCA
- HEV
- 纯电动
- 传统车
- 混动
- 柴油
-
@@ -322,7 +290,7 @@
- {{ scope.row.dutyEngineer }}
+ {{ scope.row.dutyEngineer }}
@@ -472,6 +440,8 @@ export default {
applyType: "",
},
height: null,
+ energyKindOptions: [], //存放适用车型数据
+ zrgcs: [], //责任工程师
// 新车型实施日期预警
newItems: [],
//政策新车型实施日期预警
@@ -527,11 +497,63 @@ export default {
}, {
_this: this
}, res => {
- console.log(res.data);
const result = res.data[0]
for (const field in result) {
this[field] = result[field].records
- this.newItems = result.newItems.records
+ this[field].forEach(item => {
+ // 适用车型转换
+ if (item.applyType !== null) {
+ let k = (item.applyType || "").split(",");
+ for (let i in this.energyKindOptions) {
+ for (let m = 0; m < k.length; m++) {
+ if (this.energyKindOptions[i].value === k[m]) {
+ k[m] = this.energyKindOptions[i].label;
+ }
+ item.applyType = k.join(",");
+ }
+ }
+ }
+ // 责任工程师转换
+ if (item.dutyEngineer !== null) {
+ let k = (item.dutyEngineer || "").split(",");
+ for (let i in this.zrgcs) {
+ for (let m = 0; m < k.length; m++) {
+ if (this.zrgcs[i].value === k[m]) {
+ k[m] = this.zrgcs[i].label;
+ }
+ item.dutyEngineer = k.join(",");
+ }
+ }
+ }
+ })
+ let arr = result.newItems.records
+ arr.forEach(item => {
+ // 适用车型转换
+ if (item.applyType !== null) {
+ let k = (item.applyType || "").split(",");
+ for (let i in this.energyKindOptions) {
+ for (let m = 0; m < k.length; m++) {
+ if (this.energyKindOptions[i].value === k[m]) {
+ k[m] = this.energyKindOptions[i].label;
+ }
+ item.applyType = k.join(",");
+ }
+ }
+ }
+ // 责任工程师转换
+ if (item.dutyEngineer !== null) {
+ let k = (item.dutyEngineer || "").split(",");
+ for (let i in this.zrgcs) {
+ for (let m = 0; m < k.length; m++) {
+ if (this.zrgcs[i].value === k[m]) {
+ k[m] = this.zrgcs[i].label;
+ }
+ item.dutyEngineer = k.join(",");
+ }
+ }
+ }
+ })
+ this.newItems = arr
//可能还需要调整一下条款或标准的顺序(zyh)
switch (field) {
case 'newItems':
@@ -635,7 +657,6 @@ export default {
this.newPolicyPage = 1
this.oldPolicypage = 1
}, e => {
- console.log(e)
})
},
clearBtnClick() {
@@ -653,7 +674,6 @@ export default {
},
//取消预警
cancelWarning(index, row) {
- console.log(index, row)
this.$confirm('确认取消预警?', '提示', {
confirmButtonText: '确定',
confirmButtonClass: 'common-button-primary',
@@ -661,7 +681,6 @@ export default {
type: 'warning',
roundButton: false
}).then(() => {
- console.log(569)
this.$http.get('sys/EarlyWarning/ChangePermissions', {
id: row.id,
}, {}, res => {
@@ -679,7 +698,6 @@ export default {
})
},
showStandDetails(item) {
- console.log(item)
let getStandId = item.sarId;
let getStandType = item.sortName;
// this.$http.get("lawss/sarMenu/judgeSarMenuByRole", {
@@ -805,6 +823,100 @@ export default {
window.onresize = () => {
this.height = $(".content").height() * 0.4;
};
+ //从数据库中查询下拉框数据
+ this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+ _this: this
+ }, res => {
+ this.energyKindOptions = res.data.ENERGYTYPES; // 文本状态
+ this.zrgcs = res.data.ZRGCSCLASS;
+ this.loading[this.field] = true
+ this.$http.get('sys/EarlyWarning/StandWarning', {
+ applyType: '',
+ ...this.pageConfig
+ }, {
+ _this: this
+ }, res => {
+ const result = res.data[0]
+ for (const field in result) {
+ this[field] = result[field].records
+ this[field].forEach(item => {
+ // 适用车型转换
+ if (item.applyType !== null) {
+ let k = (item.applyType || "").split(",");
+ for (let i in this.energyKindOptions) {
+ for (let m = 0; m < k.length; m++) {
+ if (this.energyKindOptions[i].value === k[m]) {
+ k[m] = this.energyKindOptions[i].label;
+ }
+ item.applyType = k.join(",");
+ }
+ }
+ }
+ // 责任工程师转换
+ if (item.dutyEngineer !== null) {
+ let k = (item.dutyEngineer || "").split(",");
+ for (let i in this.zrgcs) {
+ for (let m = 0; m < k.length; m++) {
+ if (this.zrgcs[i].value === k[m]) {
+ k[m] = this.zrgcs[i].label;
+ }
+ item.dutyEngineer = k.join(",");
+ }
+ }
+ }
+ })
+ let arr = result.newItems.records
+ arr.forEach(item => {
+ console.log(item.applyType)
+ // 适用车型转换
+ if (item.applyType !== null) {
+ let k = (item.applyType || "").split(",");
+ for (let i in this.energyKindOptions) {
+ for (let m = 0; m < k.length; m++) {
+ if (this.energyKindOptions[i].value === k[m]) {
+ k[m] = this.energyKindOptions[i].label;
+ }
+ item.applyType = k.join(",");
+ }
+ }
+ }
+ // 责任工程师转换
+ if (item.dutyEngineer !== null) {
+ let k = (item.dutyEngineer || "").split(",");
+ for (let i in this.zrgcs) {
+ for (let m = 0; m < k.length; m++) {
+ if (this.zrgcs[i].value === k[m]) {
+ k[m] = this.zrgcs[i].label;
+ }
+ item.dutyEngineer = k.join(",");
+ }
+ }
+ }
+ })
+ this.newItems = arr
+ //可能还需要调整一下条款或标准的顺序(zyh)
+ switch (field) {
+ case 'newItems':
+ this.pageConfig.count1 = result.newItems.total
+ break
+ case 'oldItems':
+ this.pageConfig.count2 = result.oldItems.total
+ break
+ case 'newStand':
+ this.pageConfig.count3 = result.newStand.total
+ break
+ case 'oldStand':
+ this.pageConfig.count4 = result.oldStand.total
+ break
+ }
+ }
+ for (const loading in this.loading) {
+ this.loading[loading] = false
+ }
+ }, e => {
+ });
+
+ });
// this.queryNewTypeByPage();
// this.queryProductionVehicleByPage();
// 四个预警同时查询,loading全部打开
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index 5ea4fe86e..bf5ddd7f1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -289,7 +289,7 @@
@selection-change="handleSelection2"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
index 7f5b9561e..a26fc9188 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
@@ -240,6 +240,7 @@ export default {
name: "wfhxzgStep2",
data() {
return {
+ passInfo: 0,
detailData: [],
loading: false,
textarea: '', // 意见
@@ -336,6 +337,9 @@ export default {
},
getFormFieldList (item) {
this.$nextTick(() => {
+ if (item.passInfo !== undefined) {
+ this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
+ }
this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
this.textarea = JSON.parse(JSON.stringify(item)).commentText
})
@@ -406,6 +410,7 @@ export default {
}
let json = {
dockUserList: list,
+ passInfo: this.passInfo
}
let flag=false
this.dataList.forEach(item => {
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
index cec18bcd1..be1ddaff0 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
@@ -247,6 +247,7 @@ export default {
name: "wfhxzgStep3",
data() {
return {
+ passInfo: 0,
detailData: [],
loading: false,
commentText: '', // 意见
@@ -320,6 +321,9 @@ export default {
},
getFormFieldList (item) {
this.$nextTick(() => {
+ if (item.passInfo !== undefined) {
+ this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
+ }
let fileData = JSON.parse(JSON.stringify(item)).dockUserList
for (let i = 0; i {
- if (res.success) {
- this.$message.success('驳回成功')
- this.$router.push('/processCenter')
- }
- this.isSubmit = false
- })
- } else {
- this.$message.warning('请输入反馈意见')
- }*/
},
// 点击查看
handlePreview (item) {
@@ -468,6 +457,7 @@ export default {
list.push(item[1])
}
let json = {
+ passInfo: this.passInfo,
responUserList: list,
actionFlag: 0
}
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 3438cea85..6fba1dcf0 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -298,7 +298,6 @@
show-overflow-tooltip
prop="standName"
label="中文名称"
- width="180px"
>
{{ scope.row.standName }}
@@ -308,7 +307,6 @@
show-overflow-tooltip
prop="standEnName"
label="英文名称"
- width="180px"
>
{{ scope.row.standEnName }}
@@ -353,10 +351,8 @@
{{scope.row.standStatusShow}}
-
-
-
+
@@ -444,8 +440,6 @@
:maxlength="100"
placeholder="请输入企标编号"
clearable
- readonly
- disabled
>
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index c1acaa477..6d8ab71ef 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -1935,9 +1935,9 @@ export default {
{type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}
// {validator: this.verify.valiateEnName, trigger: 'blur'}
],
- // standState: [
- // {required: true, message: '标准状态不能为空', trigger: 'change'}
- // ],
+ standState: [
+ {required: true, message: '文本状态不能为空', trigger: 'change'}
+ ],
replaceStandNum: [
{type: 'string', max: 100, message: '代替标准编号不能超过100个字符', trigger: 'change'}
],
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index f5c7c0a1d..aaef03de8 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -1377,10 +1377,12 @@ export default {
}, {
_this: this, loading: "loading"
}, res => {
+ this.detailedListVersion = res.data[0].detailedListVersion
if (res.data) {
this.$router.push({
name: "LocalProductDetail",
query: {
+ detailedListVersion: this.detailedListVersion,
tabName: this.ifMaintaince
}
});
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index c5ea2c3d1..05a392fc9 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -47,7 +47,7 @@
- 清单版本: {{ }}
+ 清单版本: {{ detailedListVersion ? $moment(detailedListVersion).format('YYYY-MM-DD HH:mm:ss') : '-' }}
{
this.Height = $('.contaiiner').height() - $('.contaiinerCard').height() - 190
window.onresize = () => {