diff --git a/src/components/phoneHistortTable/index.vue b/src/components/phoneHistortTable/index.vue
index 798ac4b3a..cbbf258a9 100644
--- a/src/components/phoneHistortTable/index.vue
+++ b/src/components/phoneHistortTable/index.vue
@@ -11,38 +11,40 @@
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
{{ scope.row.commentText }}
diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 473bb475f..8dc89e209 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -2295,7 +2295,7 @@ export default {
_this: this
}, res => {
this.sarStandardsInfoEO = res.data || {}
- if (this.sarStandardsInfoEO.standCode && this.sarStandardsInfoEO.standCode.indexOf('Q/FT P') !== -1) {
+ if (this.sarStandardsInfoEO.standCode && this.sarStandardsInfoEO.standCode.indexOf('Q/QCBFC') !== -1) {
this.QFTP = true
}
// this.textOptions.forEach(item => {
diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
index e75101f69..b940e3705 100644
--- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
@@ -1256,6 +1256,7 @@ export default {
},
standSelectChange (data) {
this.selectedList = []
+ this.selectedList1 = []
this.selectedAllList = data
for (let i = 0; i < data.length; i++) {
this.selectedList.push(data[i].id)
@@ -1431,6 +1432,7 @@ export default {
this.parentNode = cur[i]
}
this.zNodes = str
+ console.log(this.zNodes);
}
// 查完左侧目录后,如果没有选中的,设置最外层选中
if (JSON.stringify(this.selectSarMenu) === '{}') {
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
index 02df7e9a0..fea768a4a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
@@ -575,7 +575,6 @@
if (valid) {
this.isSubmit = true
this.$http.post('lawss/activiti/startProcessRollBack', {
- id: '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '2',
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index dad1a6582..1619e062f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -14,6 +14,7 @@
@@ -568,14 +569,17 @@
itemsName1: '',
oldNumber: ''
},
- formRules: {
- itemsNum: [
- { required: true, message: '请输入标准号/政策号', trigger: 'change' },
- ],
- itemsName: [
- { required: true, message: '请输入标准名称/政策名称', trigger: 'change' },
- ],
- },
+ formRules: {
+ itemsNum: [
+ {required: true, message: '请输入标准号/政策号', trigger: 'change'},
+ ],
+ itemsName: [
+ {required: true, message: '请输入标准名称/政策名称', trigger: 'change'},
+ ],
+ endTime: [
+ {required: true, message: '请输入截止时间', trigger: 'change'},
+ ],
+ },
// 标准征求意见数据可库
standCommonlySearch: {
numOrName: '',
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
index 0ae38b787..2e5b490eb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
@@ -910,6 +910,7 @@ export default {
this.saveLoading = true;
this.listForm.dataList = this.dataList
let _formData = new FormData();
+ _formData.append("id", this.bpnId || "");
_formData.append("createUser", this.$store.getters.userInfo.userId);
_formData.append("createUserName", this.$store.getters.userInfo.uName);
_formData.append("prcType", "5");
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
index e784e848d..cb1835263 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
@@ -807,13 +807,22 @@ export default {
this.isSubmit = false
})
},
- handlePrice(){
- for (let i = 0; i < this.dataList.length; i++) {
- if (this.dataList[i].complianceReasons|| (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime) || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){
- }else {
- this.comFlag ++
+ handlePrice() {
+ this.dataList.forEach(item =>{
+ if(item.complianceReasons){
+ this.comFlag = 0;
+ return
+ }else{
+ for (let i = 0; i < this.dataList.length; i++) {
+ if (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime !== undefined || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime === undefined)) {
+ this.comFlag = 0;
+ return;
+ } else {
+ this.comFlag++;
+ }
+ }
}
- }
+ })
},
//提交事件
handleSubmit() {
@@ -842,8 +851,6 @@ export default {
this.listForm.dataList = this.dataList;
const json = JSON.stringify(this.listForm);
this.isSubmit = true
- console.log('可以提交');
- return
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
index 91b471bb3..ede994365 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
@@ -39,7 +39,6 @@
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index f477a26c5..18460cb17 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -38,9 +38,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
index eb6f21c9e..84ca37fc6 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
@@ -37,7 +37,6 @@
disabled
v-model="form.endTime"
type="date"
- value-format="yyyy-MM-dd"
placeholder="请选择结束日期">
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index 6e876e8b2..7289b73bc 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -35,7 +35,6 @@
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
index ee6c9d4e7..2ced168e3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
@@ -34,7 +34,6 @@
{
if (valid) {
this.isSubmit = true
- var json = this.json
+ let json = this.json
+ json.info = this.data
json.commentText = this.commentText41
json.bzfgId = this.form.bzfgId
json.bzfgName = this.form.bzfgName
@@ -463,8 +463,8 @@
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.commentText41 = data.commentText41 || ''
- this.form.bzfgId = data.startUser
- this.form.bzfgName = data.startUserName
+ this.form.bzfgId = data.startUser || data.form.startUser
+ this.form.bzfgName = data.startUserName || data.form.startUserName
this.json = data
this.data = data.info || data.data
}).catch(e => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
index f305809b4..dfe399d15 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
@@ -37,7 +37,6 @@
disabled
v-model="form.endTime"
type="date"
- value-format="yyyy-MM-dd"
placeholder="请选择结束日期">
@@ -397,7 +396,8 @@
},
handleSubmit() {
this.isSubmit = true
- var json = this.json
+ let json = this.json
+ json.info = this.data
json.commentText = this.commentText42
json.bzFlag = '0'
this.$http.post('lawss/activiti/completeTask', {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index 12a5a2ebe..fe5399ae3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -35,7 +35,6 @@
@@ -645,10 +644,11 @@ export default {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
- var json = this.json
+ let json = this.json
json.actionFlag = 0
json.commentText = this.commentText4
json.spId = this.form.spId
+ json.info = this.data
json.spName = this.form.spName
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index 2caa67e8c..a9f199be1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -626,6 +626,16 @@
this.form.textType = data.form ? data.form.textType : data.textType
this.form.cid = data.form ? data.form.cid : data.cid
this.form.endTime = data.form ? data.form.endTime : data.endTime
+ this.$http.get('slrs/sar-public-idea-all/checkIsShow', {
+ endTime: this.form.endTime
+ }, {}, res => {
+ //返回0 流程未到截止日期 不能进行操作
+ if (res.message === '0') {
+ this.clickFlag = false
+ } else {
+ this.clickFlag = true
+ }
+ })
let newArr = data.info ? data.info : data.form.data
newArr.forEach(item => {
if (!item.source) {
@@ -639,16 +649,6 @@
this.json = data;
this.getItemList(data.standId,this.form.textValue)
this.data = newArr
- this.$http.get('slrs/sar-public-idea-all/checkIsShow', {
- endTime: this.form.endTime
- }, {}, res => {
- //返回0 流程未到截止日期 不能进行操作
- if (res.message === '0') {
- this.clickFlag = false
- } else {
- this.clickFlag = true
- }
- })
if (data.introduce) {
} else {
this.$http.get("slrs/sar-public-idea-all/getPublicIdea", {
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue
index 210b87d1f..67b82b874 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue
@@ -49,19 +49,6 @@
-
-
-
-
-
-
-
-
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index f0a787ece..ef7a2600f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -860,7 +860,7 @@ export default {
return
}else{
for (let i = 0; i < this.dataList.length; i++) {
- if (this.dataList[i].complianceReasons || this.dataList[i].remarks || (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime !== undefined) || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime === undefined)) {
+ if (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime !== undefined || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime === undefined)) {
this.comFlag = 0;
return;
} else {
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
index c09761aaa..cdc5a06fb 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
@@ -126,22 +126,6 @@
label="在产车实施日期">
-
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
index bb37f80bd..8138cfef5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
@@ -512,7 +512,7 @@
width="150"
label="新车型实施日期">
- {{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}
+ {{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}
{{ scope.row.xcxssrq }}
@@ -521,7 +521,7 @@
width="150"
label="在产车实施日期">
- {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}
+ {{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}
{{ scope.row.zccssrq }}
@@ -1262,8 +1262,8 @@ export default {
if(item.zrbm === '[]'){
item.zrbm = ''
}
- this.$set(item, 'zccssrq', item.zccssrqgj)
- this.$set(item, 'xcxssrq', item.xcxssrqgj)
+ this.$set(item, 'zccssrq', item.zccssrqgj || item.zccssrq)
+ this.$set(item, 'xcxssrq', item.xcxssrqgj || item.xcxssrq)
})
});
},
diff --git a/src/pages/processCenter/pages/phone/bzpg/step6.vue b/src/pages/processCenter/pages/phone/bzpg/step6.vue
index 88d2b3f31..bf3fb6576 100644
--- a/src/pages/processCenter/pages/phone/bzpg/step6.vue
+++ b/src/pages/processCenter/pages/phone/bzpg/step6.vue
@@ -2,7 +2,7 @@
标准合规评估流程
- 产品线责任人审批
+ 审核2
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{ scope.row.commentText }}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成' }}
-
-
-
+
标准征求意见流程
- 责任人会签
+ 会签