From 757533548a57023ea46c302c5958b9f0ea94b2b2 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 25 Dec 2021 13:51:25 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E5=8D=95=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 2 +- .../foreignStandardsAndRegulations/index.vue | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 1cf1bbf63..a0b51bf52 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -373,7 +373,7 @@ @click="exportTestItem">提交 - + - + :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel">

@@ -1632,9 +1632,9 @@ import MechanismTree from '@/components/mechanismTree' import CustomDatePickWithText2 from '@/components/CustomFormComponents/DatePickerWithText2' import {interfaceUrl} from "@/sysConfig"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; -import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import store from "@/store"; import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle' +import treeSelectModule from "@/components/treeSelect/treeSelectModule"; export default { @@ -1658,7 +1658,7 @@ export default { MechanismTree, CustomDatePickWithText2, TreeSelect, - TreeSelectNew, + treeSelectModule, ProcessTitle }, data() { From 14fb2224601fe4efc9592241f0f96a1e4e5fd80f Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 30 Dec 2021 17:34:23 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzjd/step2.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 32df2bcfe..41b11df2e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -69,7 +69,7 @@ 批量编辑 { this.zxIdList.push(item.id) }) + console.log(this.zxIdList) }, getData() { return new Promise((resolve, reject) => { From 642f431c441a1d13416fe38489cb30bd366ee2f3 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 30 Dec 2021 17:34:54 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzjd/step2.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 41b11df2e..45d840009 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -476,7 +476,6 @@ val.forEach( item => { this.zxIdList.push(item.id) }) - console.log(this.zxIdList) }, getData() { return new Promise((resolve, reject) => { From aa9bf648790d6d19c117ac09cd81e7919af7520a Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 30 Dec 2021 17:42:13 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=B0=83=E7=A0=94?= =?UTF-8?q?=E9=80=89=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 730458af1..b8e1bec22 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -395,7 +395,7 @@ this.roleForm.presidentUserName = data[0].name } }, - choiceZRRS () { + choiceZRRS (type) { this.type2 = type this.nodeList2 = [] if (type === '1') { From 8849004b05d377f70ce8f19d5e58023d124181bb Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 30 Dec 2021 17:46:23 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=A4=8D=E9=80=89?= =?UTF-8?q?=E6=A1=86=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index c8d3c6477..08ca7b061 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -285,8 +285,9 @@ fontWeight: 'bold', height: '48px'}" @selection-change="standSelectChange" > + + From 0bbe1a0b5d3038af2669ee03f973b304c5c0e523 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 30 Dec 2021 17:48:23 +0800 Subject: [PATCH 6/6] commit --- src/assets/styles/phone.less | 21 ++-- .../pages/creatProcess/bzjd/step4.vue | 1 - .../processCenter/pages/phone/bzdy/step2.vue | 104 ++++++---------- .../processCenter/pages/phone/bzdy/step4.vue | 106 +++++------------ .../processCenter/pages/phone/bzdy/step6.vue | 56 +++------ .../processCenter/pages/phone/bzdy/step7.vue | 50 +++----- .../processCenter/pages/phone/bzdy/step8.vue | 57 +++------ .../processCenter/pages/phone/bzdy/step9.vue | 50 +++----- .../processCenter/pages/phone/bzjd/step4.vue | 56 ++------- .../processCenter/pages/phone/bzjd/step5.vue | 54 +-------- .../processCenter/pages/phone/bzjd/step6.vue | 54 +-------- .../pages/phone/bzzqyj/step2.vue | 112 +++++++----------- .../pages/phone/bzzqyj/step4-1.vue | 112 +++++++----------- .../pages/phone/bzzqyj/step4-2.vue | 94 +++++---------- .../pages/phone/bzzqyj/step6.vue | 94 +++++---------- .../pages/phone/bzzqyj/step7.vue | 94 +++++---------- .../pages/phone/bzzqyj/step8.vue | 94 +++++---------- .../pages/phone/bzzqyj/step9.vue | 94 +++++---------- .../tabComponents/processCenter/index.vue | 2 +- 19 files changed, 392 insertions(+), 913 deletions(-) diff --git a/src/assets/styles/phone.less b/src/assets/styles/phone.less index 4a6ed2d29..ed8788584 100644 --- a/src/assets/styles/phone.less +++ b/src/assets/styles/phone.less @@ -1,20 +1,13 @@ .phoneBox { width: 100%; height: 100%; - .form-item-disabled { - color: #666 !important; - /deep/.el-form-item__label { - color: #666 !important; - } - /deep/.el-form-item__content { - color: #666 !important; - /deep/.el-input { - color: #666 !important; - /deep/.el-input__inner { - color: #666 !important; - } - } - } + .van-cell { + padding: 10px 0; + } + /deep/.van-field__label { + width: 100px; + margin-right: 0px; + padding-left: 10.38px; } .headerTabs { height: 52px; diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index b71f48e49..6f9574225 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -264,7 +264,6 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" - @save="handleSave" @submit="handleSubmit" show-back @back="handleSubmitNo" diff --git a/src/pages/processCenter/pages/phone/bzdy/step2.vue b/src/pages/processCenter/pages/phone/bzdy/step2.vue index 5d50cef7a..190212ad1 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step2.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step2.vue @@ -23,66 +23,40 @@

- - - - - - - - - - -
-
- {{ item.name }} - - - - - - -
-
-
- - - -
-
- -
-
- {{ item.name }} - - - - - - -
-
-
- - - -
-
- - - - -
-
+ + + + + +
+
+ {{ item.name }} +
+
+
+ - - +
+
+ +
+
+ {{ item.name }} +
+
+
+ - - +
+
+ + + + + +
隐藏基础信息 @@ -92,13 +66,9 @@
- - + + +
diff --git a/src/pages/processCenter/pages/phone/bzdy/step4.vue b/src/pages/processCenter/pages/phone/bzdy/step4.vue index 0bc581b48..1d4b2d1a6 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step4.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step4.vue @@ -23,58 +23,30 @@
- - - - - - - - - - -
-
- {{ item.name }} - - - - - - -
-
-
- - - -
-
- -
-
- {{ item.name }} - - - - - - -
-
-
- - - -
-
-
-
+ + + + + +
+
+ {{ item.name }} +
+
+
+ - - +
+
+ +
+
+ {{ item.name }} +
+
+
+ - - +
+
隐藏基础信息 @@ -91,29 +63,15 @@
{{ form.fileName }}
- - - - - -
- -
- - - + + + @@ -122,13 +80,9 @@
- - + + +
diff --git a/src/pages/processCenter/pages/phone/bzdy/step6.vue b/src/pages/processCenter/pages/phone/bzdy/step6.vue index e650dc453..83b9dd7ad 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step6.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step6.vue @@ -23,40 +23,18 @@
- - - - - - - - - - -
- {{ form.hzfileName }} - - - - - - -
-
- - - -
-
-
-
+ + + + + +
+ {{ form.hzfileName }} +
+
+ - - +
+
隐藏基础信息 @@ -107,13 +85,9 @@
- - + + +
diff --git a/src/pages/processCenter/pages/phone/bzdy/step7.vue b/src/pages/processCenter/pages/phone/bzdy/step7.vue index c65a94785..374eb0fb6 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step7.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step7.vue @@ -22,34 +22,18 @@
- - - - - - - - - - -
- {{ form.hzfileName }} -
-
- - - -
-
-
-
+ + + + + +
+ {{ form.hzfileName }} +
+
+ - - +
+
隐藏基础信息 @@ -93,13 +77,9 @@
- - + + +
diff --git a/src/pages/processCenter/pages/phone/bzdy/step8.vue b/src/pages/processCenter/pages/phone/bzdy/step8.vue index 240142473..11e64c409 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step8.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step8.vue @@ -22,41 +22,18 @@
- - - - - - - - - - -
- {{ form.hzfileName }} -
-
- - - -
-
- - - - - - - -
-
+ + + + + +
+ {{ form.hzfileName }} +
+
+ - - +
+
隐藏基础信息 @@ -100,13 +77,9 @@
- - + + +
diff --git a/src/pages/processCenter/pages/phone/bzdy/step9.vue b/src/pages/processCenter/pages/phone/bzdy/step9.vue index 24d716ab1..32b7dd9fc 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step9.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step9.vue @@ -22,34 +22,18 @@
- - - - - - - - - - -
- {{ form.hzfileName }} -
-
- - - -
-
-
-
+ + + + + +
+ {{ form.hzfileName }} +
+
+ - - +
+
隐藏基础信息 @@ -93,13 +77,9 @@
- - + + +
diff --git a/src/pages/processCenter/pages/phone/bzjd/step4.vue b/src/pages/processCenter/pages/phone/bzjd/step4.vue index 4b1877357..f8a0e0ab6 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step4.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step4.vue @@ -21,54 +21,14 @@
- - - - - - - - - - - - - - - - - - - - - - + + + + + + + +
隐藏基础信息 diff --git a/src/pages/processCenter/pages/phone/bzjd/step5.vue b/src/pages/processCenter/pages/phone/bzjd/step5.vue index 74c4437a3..0a5aaa32a 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step5.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step5.vue @@ -21,54 +21,12 @@
- - - - - - - - - - - - - - - - - - - - - - + + + + + +
隐藏基础信息 diff --git a/src/pages/processCenter/pages/phone/bzjd/step6.vue b/src/pages/processCenter/pages/phone/bzjd/step6.vue index 8da9a9684..aa52f364e 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step6.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step6.vue @@ -21,54 +21,12 @@
- - - - - - - - - - - - - - - - - - - - - - + + + + + +
隐藏基础信息 diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue index 6d2074f2b..704685e2a 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue @@ -22,83 +22,53 @@
- - - - - - - - - - - -
-
- {{ item.fileName }} - - - - - - -
-
-
- -
-
- {{ item.name }} - - - - - - -
-
-
- - - -
-
- - - - -
-
+ + + + + + +
+
+ {{ item.fileName }} +
+
+
+ +
+
+ {{ item.name }} +
+
+
+ - - +
+
+ + + + + +
- - + + +
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue index 41a91f071..44b8500f1 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue @@ -22,70 +22,44 @@
- - - - - - - - - - - -
-
- {{ item.fileName }} - - - - - - -
-
-
- -
-
- {{ item.name }} - - - - - - -
-
-
- - - -
-
- - - - -
-
+ + + + + + +
+
+ {{ item.fileName }} +
+
+
+ +
+
+ {{ item.name }} +
+
+
+ - - +
+
+ + + + + +
@@ -158,13 +132,9 @@
- - + + +
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue index d18fb4b18..8ee40316b 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue @@ -22,62 +22,34 @@
- - - - - - - - - - - -
-
- {{ item.fileName }} - - - - - - -
-
-
- -
-
- {{ item.name }} - - - - - - -
-
-
- - - -
-
-
-
+ + + + + + +
+
+ {{ item.fileName }} +
+
+
+ +
+
+ {{ item.name }} +
+
+
+ - - +
+
@@ -150,13 +122,9 @@
- - + + +
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue index 2d2ccf72b..1c2cdefb2 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue @@ -22,62 +22,34 @@
- - - - - - - - - - - -
-
- {{ item.fileName }} - - - - - - -
-
-
- -
-
- {{ item.name }} - - - - - - -
-
-
- - - -
-
-
-
+ + + + + + +
+
+ {{ item.fileName }} +
+
+
+ +
+
+ {{ item.name }} +
+
+
+ - - +
+
@@ -170,13 +142,9 @@
- - + + +
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue index 5bbd4d91a..03240c55f 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue @@ -22,62 +22,34 @@
- - - - - - - - - - - -
-
- {{ item.fileName }} - - - - - - -
-
-
- -
-
- {{ item.name }} - - - - - - -
-
-
- - - -
-
-
-
+ + + + + + +
+
+ {{ item.fileName }} +
+
+
+ +
+
+ {{ item.name }} +
+
+
+ - - +
+
@@ -170,13 +142,9 @@
- - + + +
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step8.vue b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue index fa154ef1e..c0401b9ae 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue @@ -22,62 +22,34 @@
- - - - - - - - - - - -
-
- {{ item.fileName }} - - - - - - -
-
-
- -
-
- {{ item.name }} - - - - - - -
-
-
- - - -
-
-
-
+ + + + + + +
+
+ {{ item.fileName }} +
+
+
+ +
+
+ {{ item.name }} +
+
+
+ - - +
+
@@ -170,13 +142,9 @@
- - + + +
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue index 7873858e3..d89399ddb 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue @@ -22,62 +22,34 @@
- - - - - - - - - - - -
-
- {{ item.fileName }} - - - - - - -
-
-
- -
-
- {{ item.name }} - - - - - - -
-
-
- - - -
-
-
-
+ + + + + + +
+
+ {{ item.fileName }} +
+
+
+ +
+
+ {{ item.name }} +
+
+
+ - - +
+
@@ -170,13 +142,9 @@
- - + + +
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 882d3509e..f14ccef02 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -682,7 +682,7 @@ export default { }) } else if (row.taskInfo === '责任对接人审批') { this.$router.push({ - name: 'bzdyStep4', + name: 'phoneBzdyStep4', query: { taskIds: row.taskIds, prcId: row.prcId,