From 8fd10e0b3f719fac5ab5a8918a687b67aa9ddcae Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 23 Jul 2021 09:58:30 +0800 Subject: [PATCH 01/24] commit --- package-lock.json | 200 +++++++++++--------- package.json | 1 + src/pages/config/pages/linkManage/index.vue | 26 ++- 3 files changed, 135 insertions(+), 92 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3d1e87236..5af38045b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3619,6 +3619,23 @@ "upath": "^1.1.1" } }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -4564,6 +4581,94 @@ } } }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.3.3", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.3.3.tgz", + "integrity": "sha512-/1GzCuQ6MRORbC+leKTKoTGtpQt60bYe0gDGEextSteA2OM+v201FPha5jzmjQzVhRcwieZeUvezAtG5a/e5cw==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", + "dev": true, + "optional": true + }, + "chalk": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, + "json5": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", + "dev": true, + "optional": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "vue-style-loader": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz", @@ -9208,7 +9313,7 @@ }, "image-size": { "version": "0.5.5", - "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", + "resolved": "https://registry.nlark.com/image-size/download/image-size-0.5.5.tgz", "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", "dev": true, "optional": true @@ -12300,6 +12405,11 @@ "is-plain-obj": "^1.0.0" } }, + "sortablejs": { + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz", + "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==" + }, "source-list-map": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", @@ -13517,94 +13627,6 @@ "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.22.4.tgz", "integrity": "sha512-XLI5s0AdqMP2Lf4I4CmdmOq8kjb5DDFGR77wAuxCfpEuYSfhTRyyx6MetgZMiL6Lxa0DasjBOiOcciU3NkL3/Q==" }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.3.3", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.3.3.tgz", - "integrity": "sha512-/1GzCuQ6MRORbC+leKTKoTGtpQt60bYe0gDGEextSteA2OM+v201FPha5jzmjQzVhRcwieZeUvezAtG5a/e5cw==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", - "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "hash-sum": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz", - "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-router": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.0.tgz", diff --git a/package.json b/package.json index bdd1937f8..d496afb94 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "jquery": "^3.5.1", "js-base64": "^2.6.2", "moment": "^2.29.1", + "sortablejs": "^1.14.0", "v-charts": "^1.19.0", "vue": "^2.6.11", "vue-clipboard2": "^0.3.1", diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index df2ef0f22..d240cc882 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -50,7 +50,7 @@ - + @@ -103,6 +103,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 21631e4b2..0158e60ac 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -51,8 +51,6 @@ row-key= "id" height="70%" border - lazy - :load="load" @selection-change="selectStandChange" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @@ -224,13 +222,6 @@ export default { }; }, methods: { - load(tree, treeNode, resolve) { - setTimeout(() => { - resolve( - this.listForm.children - ) - }, 1000) - }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -266,32 +257,50 @@ export default { }, //动态表单读取 getFormFieldList(item) { - this.$nextTick(() => { - this.listForm = JSON.parse(JSON.stringify(item)); - item.dataList.forEach(item => { - item.hasChildren = true - }) - this.listForm.prcNum = this.prcNum; - this.listForm.prcName = this.prcName; - this.listForm["id"] = item.id; - this.listForm.dataList = item.dataList; - this.dataList = item.dataList; - this.dataList.distributePerson = item.dataList[0].distributePerson; - this.listForm.breakdownList = item.breakdownList; - this.listForm.children = item.breakdownList; - let children = [] - item.breakdownList.forEach( - item=>{ - let aa = { - id:item.id, - standId:'条款号: '+ item.itemsNum, - standName:'条款名称: '+ item.itemsName, + const listForm = JSON.parse(JSON.stringify(item)); + const { breakdownList, dataList } = listForm + listForm.prcNum = this.prcNum; + listForm.prcName = this.prcName; + this.listForm = listForm + listForm["id"] = item.id; + listForm.dataList = item.dataList; + dataList.forEach(stand => { + stand.hasChildren = true + console.log(stand); + const children = [] + breakdownList.forEach(childItem => { + if (stand.standId === childItem.standId) { + const childItemData = { + id: childItem.id, + standId: '条款号: '+ childItem.itemsNum, + standName: '条款名称: '+ childItem.itemsName } - children.push(aa) + children.push(childItemData) } - ) - this.listForm.children = children; - }); + }) + if (children.length) { + stand.children = children + stand.hasChildren = true + } + }) + + // dataList.distributePerson = item.dataList[0].distributePerson; + // listForm.breakdownList = item.breakdownList; + // listForm.children = item.breakdownList; + // let children = [] + // item.breakdownList.forEach( + // item=>{ + // let aa = { + // id:item.id, + // standId:'条款号: '+ item.itemsNum, + // standName:'条款名称: '+ item.itemsName, + // } + // children.push(aa) + // } + // ) + // this.listForm.children = children; + this.dataList = dataList + console.log(this.dataList) }, //保存事件 handleSave() { @@ -377,7 +386,8 @@ export default { return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; } }, - mounted() { + async mounted() { + // const res = await xx() this.processTable(); this.getData(); this.getTree(); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 60a93e5dc..5ba515f15 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -1,13 +1,586 @@ - + diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index ba58aec42..6ab697efe 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -30,10 +30,11 @@
- 调取 - 批量删除 + 调取 + 批量删除 导出 From 7c8c50ca6c04fed98edf9ace05b24281d6760813 Mon Sep 17 00:00:00 2001 From: fanlin Date: Fri, 23 Jul 2021 14:09:09 +0800 Subject: [PATCH 07/24] =?UTF-8?q?bug=EF=BC=9A=E5=9B=BD=E5=86=85=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=BC=96=E8=BE=91-=E6=A0=87=E5=87=86=E5=B9=B4?= =?UTF-8?q?=E4=BB=BD=E9=9C=80=E4=BF=AE=E6=94=B9=E5=8F=AA=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=95=B0=E5=AD=97,=E9=99=90=E5=88=B6?= =?UTF-8?q?=E5=AD=97=E7=AC=A6100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/verify/index.js | 9 +++++++++ .../domesticStandardsAndRegulations/index.vue | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/common/verify/index.js b/src/common/verify/index.js index acb0272ba..2f030082a 100644 --- a/src/common/verify/index.js +++ b/src/common/verify/index.js @@ -457,6 +457,15 @@ export default { callback() } }, + // 验证输入数字和英文 + testNumberCode (rule, value, callback) { + let reg = /[0-9\-]/ + if (value !== '' && !value.match(reg)) { + return callback(new Error('只能输入数字')) + } else { + callback() + } + }, validUrl (rule, value, callback) { let reg = /(^((https|ftp|http|file):\/\/)|www\.)*([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/gm if (!value.match(reg)) { diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index abc7e6b24..732e58cb5 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1765,8 +1765,8 @@ export default { ], standYear: [ {required: true, message: '标准年份不能为空', trigger: 'change'}, - {validator: this.verify.testItemCode, trigger: 'change'}, - {type: 'string', max: 20, message: '标准年份不能超过20个字符', trigger: 'change'} + {validator: this.verify.testNumberCode, trigger: 'change'}, + {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'} ], standName: [ {required: true, message: '中文名称不能为空', trigger: 'change'}, From a5175c49675dc489d76a6905545a9b28ecea6045 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 23 Jul 2021 14:17:21 +0800 Subject: [PATCH 08/24] commit --- src/pages/config/pages/linkManage/index.vue | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index d240cc882..9c37984b4 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -8,11 +8,11 @@ @click="addLink" v-btn-permission="'980cb239683de9e29ee5335cec98e5b4'" size="mini">新增 - 顺序调整 + + + + + { item.orderBy = index + 1 }) + let arr = [] + this.sortData.forEach(item => { + let json = {} + json.id = item.id + json.orderBy = item.orderBy + arr.push(json) + }) + this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => { + this.$message.success('保存成功') + }) } }) }, From eae877d7959c0951b188b4b57605f2b7e0aa6a48 Mon Sep 17 00:00:00 2001 From: fanlin Date: Fri, 23 Jul 2021 14:19:00 +0800 Subject: [PATCH 09/24] =?UTF-8?q?bug:=20=E5=9B=BD=E5=86=85=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E7=BC=96=E8=BE=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=BF=9B=E5=85=A5=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InputForStandards.vue | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue index 9a5278cba..249090656 100644 --- a/src/components/CustomFormComponents/InputForStandards.vue +++ b/src/components/CustomFormComponents/InputForStandards.vue @@ -336,20 +336,28 @@ export default { standNum = item.standSort + ' ' + item.standNumber } // 验证标准号在系统中是否存在 - this.$http.post('lawss/sarTestItem/validateStandNumber', { - standnumber: standNum - }, { - _this: this - }, res => { - let routeUrl = this.$router.resolve({ - name: 'OtherStandardDetails', - params: { - id: item.id, - pageType: 'INLAND_STAND' - } - }) - window.open(routeUrl.href, '_blank') + // this.$http.post('lawss/sarTestItem/validateStandNumber', { + // standnumber: standNum + // }, { + // _this: this + // }, res => { + // let routeUrl = this.$router.resolve({ + // name: 'OtherStandardDetails', + // params: { + // id: item.id, + // pageType: 'INLAND_STAND' + // } + // }) + // window.open(routeUrl.href, '_blank') + // }) + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.id, + pageType: 'INLAND_STAND' + } }) + window.open(routeUrl.href, '_blank') }, getResetLawsNumRow () { this.replacePage = 1 From 74a795eadb5a9407628b0970dd87a3b517a0482d Mon Sep 17 00:00:00 2001 From: fanlin Date: Fri, 23 Jul 2021 14:37:48 +0800 Subject: [PATCH 10/24] =?UTF-8?q?bug:=20=E5=9B=BD=E5=86=85=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9F=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=90=8E=EF=BC=8C=E5=8F=91=E5=B8=83=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomFormComponents/DatePicker.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/CustomFormComponents/DatePicker.vue b/src/components/CustomFormComponents/DatePicker.vue index 19fbd067e..c5ea683dc 100644 --- a/src/components/CustomFormComponents/DatePicker.vue +++ b/src/components/CustomFormComponents/DatePicker.vue @@ -11,6 +11,8 @@ :class="{'form-item-disabled': disabled}" > Date: Fri, 23 Jul 2021 14:48:11 +0800 Subject: [PATCH 11/24] =?UTF-8?q?bug=EF=BC=9A=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E7=9A=84=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9?= =?UTF-8?q?=EF=BC=8C=E5=9B=BD=E5=A4=96=E6=A0=87=E5=87=86=E5=BA=93=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E6=88=90=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 60d989f4a..27deb03e8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -940,7 +940,7 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace">
- 取消 + 取消 提交
@@ -987,7 +987,7 @@ v-model="standardSearchForm.standType" placeholder="请选择标准来源"> - + From f2551eb8816d7cee60e9592a2a59ae0805926b72 Mon Sep 17 00:00:00 2001 From: fanlin Date: Fri, 23 Jul 2021 15:03:14 +0800 Subject: [PATCH 12/24] =?UTF-8?q?bug:=20=E5=9B=BD=E5=86=85=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E5=85=A5=E5=BA=93=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=9A=84=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=A0=87=E5=87=86=E6=80=A7=E8=B4=A8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=EF=BC=8C=E9=99=84=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 0d47b1ac6..179e7af34 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -47,7 +47,7 @@

{{ sarStandardsInfoEO.standYear || '-' }}

{{ sarStandardsInfoEO.standName || '-' }}

{{ sarStandardsInfoEO.standEnName || '-' }}

-

{{ sarStandardsInfoEO.standNature || '-' }}

+

{{ standMap[sarStandardsInfoEO.standNature] || '-' }}