diff --git a/src/assets/styles/newStyle.less b/src/assets/styles/newStyle.less
index 32e75bb19..2882fb567 100644
--- a/src/assets/styles/newStyle.less
+++ b/src/assets/styles/newStyle.less
@@ -909,4 +909,8 @@ tr.el-table__row{
.button-list {
padding: 5px 0px;
}
+.myNewSelect {
+ backgrounnd: red;
+
+}
diff --git a/src/components/index.js b/src/components/index.js
index 50327d085..fde9957d4 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -24,6 +24,7 @@ import DeptRoleTree from './deptRoleTree' // 根据部门查询角色
import RoleTree from './roleTree' // 查询所有机构及人员
import SQTree from './SQTree'
import OrgTable from './OrgTable'
+import MySelect from './mySelect'
const install = function (Vue) {
Vue.component('loading', Loading)
@@ -48,6 +49,7 @@ const install = function (Vue) {
Vue.component('SQTree', SQTree)
Vue.component('OrgTable', OrgTable)
Vue.component('RoleTree', RoleTree)
+ Vue.component('MySelect', MySelect)
}
export default {
diff --git a/src/components/mySelect/index.vue b/src/components/mySelect/index.vue
new file mode 100644
index 000000000..d741c70e5
--- /dev/null
+++ b/src/components/mySelect/index.vue
@@ -0,0 +1,140 @@
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue
index 7afe67ada..266344463 100644
--- a/src/pages/processCenter/pages/components/ProcessFooter.vue
+++ b/src/pages/processCenter/pages/components/ProcessFooter.vue
@@ -53,7 +53,7 @@
size="small"
class="common-button-danger"
@click="beforeBack"
- :loading="isSubmit"
+ :loading="isSubmitBack"
v-if="showBack">
{{ backBTNText }}
@@ -151,6 +151,11 @@ export default {
type: Boolean,
default: false
},
+ // 保存按钮loading
+ isSubmitBack: {
+ type: Boolean,
+ default: false
+ },
// 是否默认委托事件
defaultEntrust: {
type: Boolean,
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 162232581..9b7748313 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -114,7 +114,9 @@
label="核心技术要求"
align="center">
-
+
+
+
-
+
+
+
-
+
+
+
-
-
-
-
+
-
+
+
+
@@ -177,7 +182,7 @@
align="center">
@@ -189,9 +194,7 @@
label="适用车型"
align="center">
-
-
-
+
{
})
@@ -561,6 +574,9 @@
_this: this
}, res => {
this.cxList = res.data.ENERGYTYPES // 适用车型
+ this.cxList.forEach(item => {
+ item.value = item.label
+ })
})
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index b15859b09..de2138c64 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
@@ -31,7 +31,7 @@
- {{ scope.row.standSerialNumber }}
+ {{ scope.row.standId }}
@@ -102,7 +102,7 @@
确认+选择责任人
-
+
@@ -114,7 +114,7 @@
负责人
-
+
@@ -126,7 +126,7 @@
分发负责人
-
+
@@ -148,7 +148,7 @@
@@ -210,9 +210,9 @@
@selection-change="selectedChange"
>
-
+
- {{ scope.row.standSerialNumber }}
+ {{ scope.row.standId }}
@@ -291,6 +291,7 @@ export default {
pageSize: 10,
total: 0,
closeState: '1',
+ standId: '',
standSerialNumber: '', // 标准号/名称
productName: '', // 项目名称
responsibleUnit: '' // 责任部门
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
index 34d9c9a60..b52339f31 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
@@ -97,9 +97,9 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
-
+
- {{ scope.row.standSerialNumber }}
+ {{ scope.row.standId }}
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
index e8a67fc9b..5716eb580 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
@@ -99,9 +99,9 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
-
+
- {{ scope.row.standSerialNumber }}
+ {{ scope.row.standId }}
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
index a684c38a4..71d89ca6a 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
@@ -87,9 +87,9 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
-
+
- {{ scope.row.standSerialNumber }}
+ {{ scope.row.standId }}
@@ -118,6 +118,7 @@
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
:before-upload="handleBeforeUpload"
:before-remove="handleBeforeRemove"
+ :on-remove="handleONRemove"
:on-success="handleOnsuccess"
>
{
if (item.fileText.length !== 0) {
- item.fileText.forEach(item1 => {
- this.fileTextList.push({
- id: item1.id,
- name: item1.name
- })
- })
+ this.fileTextList = item.fileText
}
})
})
@@ -335,10 +331,18 @@ export default {
// 文件上传成功
handleOnsuccess(res, file, fileList) {
if (res.ok) {
- this.newDataList.push({
- id: res.data.attId,
- name: res.data.standName
- })
+ if (this.fileTextList !== null) {
+ this.newDataList = this.fileTextList
+ this.newDataList.push({
+ id: res.data.attId,
+ name: res.data.standName
+ })
+ } else {
+ this.newDataList.push({
+ id: res.data.attId,
+ name: res.data.standName
+ })
+ }
this.fileListData.fileText = this.newDataList
this.$message({
showClose: true,
@@ -377,14 +381,17 @@ export default {
},
// 移除上传的文件
handleBeforeRemove(file, fileList) {
+ this.fileListData.fileText = fileList
this.fileTextList = fileList
- this.newDataList.forEach((item, index) => {
+/* this.newDataList.forEach((item, index) => {
if (file.name === item.name || file.id === item.id) {
this.newDataList.splice(index, 1)
- }
- })
- },
+ console.log(this.dataList)
+ }
+ })*/
+ },
+ handleONRemove() {},
/************ ********* *****************/
// 点击查看
handlePreview (item) {
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
index ab8c6df90..865a6a96e 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
@@ -87,9 +87,9 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
-
+
- {{ scope.row.standSerialNumber }}
+ {{ scope.row.standId }}
@@ -201,7 +201,7 @@
approval
@back="handleSubmitNo"
:submitLoading="isSubmit"
- :saveLoading="saveLoading"
+ :isSubmitBack="backLoading"
@submit="handleSubmit"
submitBTNText="同意"
>
@@ -357,6 +357,7 @@ export default {
})
},
handleSubmitNo() {
+ this.backLoading = true
if (this.commentText) {
var json = {
responUserInfo: {
@@ -372,12 +373,13 @@ export default {
}, {}, res => {
if (res.success) {
this.$message.success('驳回成功')
- this.fileTextList = []
this.$router.push('/processCenter')
+ this.backLoading = false
}
})
} else {
this.$message.warning('请输入反馈意见')
+ this.backLoading = false
}
},
//未整改项抽屉中的查询按钮
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
index 5842ea30e..e01298782 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
@@ -405,6 +405,7 @@ export default {
drawerTitle: "", //drawer标题
// 查询相关参数
searching: false,
+ commentText:'',
standardSearch: {
standType: "",
standName: ""
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 5c28d466d..93b96686c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -389,6 +389,7 @@ export default {
productData: [], //添加抽屉的数据
standList: [], //新添加的标准
modalshowflag: false, // drawer开关
+ commentText: '',
drawerTitle: "", //drawer标题
// 查询相关参数
searching: false,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index 856ce6777..91cc0a018 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -456,4 +456,8 @@ export default {
}
}
- .dem
+ .demo-drawer-content {
+ margin-top: 10px;
+ }
+}
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 49726090c..aafe0469e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -126,21 +126,7 @@
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index 684e338b6..9bf3d7814 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -591,4 +591,8 @@ export default {
}
}
- .demo-
+ .demo-drawer-content {
+ margin-top: 10px;
+ }
+}
+>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
index 95cf31713..da7a853ea 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
@@ -580,4 +580,8 @@ export default {
}
}
- .demo-
+ .demo-drawer-content {
+ margin-top: 10px;
+ }
+}
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
index 3f5518210..d12fc2bc4 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
@@ -510,7 +510,6 @@ export default {