diff --git a/package-lock.json b/package-lock.json index 3d1e87236..0b1644602 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9208,7 +9208,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 @@ -11040,6 +11040,12 @@ "polyline-miter-util": "^1.0.1" } }, + "popper.js": { + "version": "1.16.1", + "resolved": "https://registry.npm.taobao.org/popper.js/download/popper.js-1.16.1.tgz", + "integrity": "sha1-KiI8s9x7YhPXQOQDcr5A3kPmWxs=", + "dev": true + }, "portfinder": { "version": "1.0.28", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", @@ -12300,6 +12306,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", @@ -13519,8 +13530,8 @@ }, "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==", + "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.3.3.tgz", + "integrity": "sha1-5EDk6xJ4bhYTi12YthIgjynd9TI=", "dev": true, "optional": true, "requires": { @@ -13531,8 +13542,8 @@ "dependencies": { "ansi-styles": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995651629&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz", + "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=", "dev": true, "optional": true, "requires": { @@ -13541,8 +13552,8 @@ }, "chalk": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", - "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz", + "integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=", "dev": true, "optional": true, "requires": { @@ -13552,8 +13563,8 @@ }, "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==", + "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz", + "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", "dev": true, "optional": true, "requires": { @@ -13562,29 +13573,29 @@ }, "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==", + "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz", + "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=", "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==", + "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626716578584&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz", + "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=", "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==", + "resolved": "https://registry.npm.taobao.org/hash-sum/download/hash-sum-2.0.0.tgz", + "integrity": "sha1-gdAbtd6OpKIUrV1urRtSNGCwtFo=", "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==", + "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz", + "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=", "dev": true, "optional": true, "requires": { @@ -13595,8 +13606,8 @@ }, "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==", + "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1626703455199&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz", + "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=", "dev": true, "optional": true, "requires": { diff --git a/package.json b/package.json index bdd1937f8..ab87a247b 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", @@ -34,6 +35,7 @@ "@vue/cli-service": "~4.5.0", "less": "^3.13.1", "less-loader": "^5.0.0", + "popper.js": "^1.16.1", "vue-template-compiler": "^2.6.11", "webpack": "^4.27.1" } diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js index a87c8a3ac..94d623b60 100644 --- a/src/api/unqualProcess.js +++ b/src/api/unqualProcess.js @@ -24,3 +24,17 @@ export function uploadFileText (data) { params: data }) } +export function dicTypeData (data) { + return axios({ + url: 'api/sys/dictype/getDicTypeListCode', + method: 'get', + params: data + }) +} +export function StandardsInfoPage (data) { + return axios({ + url: 'api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', + method: 'get', + params: data + }) +} 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/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}" >
- 取消 + 取消 提交
@@ -336,7 +336,7 @@ export default { standNum = item.standSort + ' ' + item.standNumber } // 验证标准号在系统中是否存在 - this.$http.post('lawss/sarTestItem/validateStandNumber', { + this.$http.post('sarStandardsInfo/sar-standards-info/validateStandNumber', { standnumber: standNum }, { _this: this diff --git a/src/components/treeSelect/treeSelectNew.vue b/src/components/treeSelect/treeSelectNew.vue index 1ac8eb973..b8a892ea0 100644 --- a/src/components/treeSelect/treeSelectNew.vue +++ b/src/components/treeSelect/treeSelectNew.vue @@ -218,6 +218,20 @@ this.isShowSelect = !this.isShowSelect; } }, + // 递归 + getTreeData(data) { + // 循环遍历json数据 + for (let i = 0; i < data.length; i++) { + if (data[i].children.length < 1) { + // children若为空数组，则将children设为undefined + delete data[i].children + } else { + // children若不为空数组，则继续 递归调用 本方法 + this.getTreeData(data[i].children) + } + } + return data + }, // 节点选中状态发生变化时的回调 handleCheckChange () { var checkedKeys = this.$refs.tree.getCheckedKeys(); // 所有被选中的节点的 key 所组成的数组数据 diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index df2ef0f22..f23611502 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -1,322 +1,356 @@ \ No newline at end of file + diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue index 0f19d2965..e3853293a 100644 --- a/src/pages/config/pages/postManage/index.vue +++ b/src/pages/config/pages/postManage/index.vue @@ -45,7 +45,7 @@ width="170px"> diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 0d47b1ac6..ec83598da 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] || '-' }}

- + @@ -330,24 +311,8 @@ export default { this.drawerTitle = title this.modalshowflag = true }, - // 获取流程节点数据 - getTree () { - roleTreeData().then(res => { - this.treeData = res.data - this.dutyUserCaseData = res.data - }) - }, drawerCheck (data) { - var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); - if(getlist.length !== 0) { - this.roleRow = getlist - }else { - this.$refs.tree.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree.getCheckedNodes() - } - }, - // 流程节点负责人抽屉保存按钮 - saveUserInfo () { + this.roleRow = data // 选取负责人时的操作 this.multipleSelection.forEach(item => { item.dutyPeopleInfo = this.roleRow[0].name @@ -356,11 +321,7 @@ export default { this.lastDataList = this.dataList this.$refs.multipleTable.clearSelection(); // 选取流程信息完成 - this.roleForm.dutyUserInfoName = this.roleRow.name - this.modalshowflag = false - }, - // 流程节点负责人抽屉取消按钮 - cancleUserInfo () { + this.roleForm.dutyUserInfoName = this.roleRow[0].name this.modalshowflag = false }, //查询按钮 diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index a925e4f10..599337f8c 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -137,32 +137,13 @@ @submit="handleSubmit" > - - - - - + @@ -309,34 +290,15 @@ export default { }) }, - // 获取流程节点数据 - getTree () { - this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { - this.treeData = res.data - }) - }, drawerCheck (data) { - var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); - if(getlist.length == 1) { - this.roleRow = getlist[0] - }else { - this.$refs.tree.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree.getCheckedNodes()[0] - } - }, - // 流程节点负责人抽屉保存按钮 - saveUserInfo () { + this.roleForm = data[0] // 选择责任人时input框内值 this.newDataList.dutyPeople = this.roleRow.name this.newDataList.dutyPeopleId = this.roleRow.id this.lastDataList = this.dataList - console.log(this.dataList) - this.modalshowflag = false - }, - // 流程节点负责人抽屉取消按钮 - cancleUserInfo () { this.modalshowflag = false }, + //查询按钮 getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询 this.realList = this.dataList.filter(item => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index d06cd4287..1c6baaad8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -336,34 +336,13 @@ > - - - - - + @@ -507,27 +486,27 @@ export default { }; }, methods: { - saveUserInfo() { + checkedRole(data) { if (this.type === "dockUser") { - this.roleForm.dockUser = this.roleRow.id; - this.roleForm.dockUserName = this.roleRow.name; + this.roleForm.dockUser = data[0].id; + this.roleForm.dockUserName = data[0].name; } else if (this.type === "ministerUser") { - this.roleForm.ministerUser = this.roleRow.id; - this.roleForm.ministerUserName = this.roleRow.name; + this.roleForm.ministerUser = data[0].id; + this.roleForm.ministerUserName = data[0].name; } else if (this.type === "qualityEngineer") { - this.roleForm.qualityEngineer = this.roleRow.id; - this.roleForm.qualityEngineerName = this.roleRow.name; - this.listForm.qualityEngineer = this.roleForm.qualityEngineer; - this.listForm.qualityEngineerName = this.roleForm.qualityEngineerName; + this.roleForm.qualityEngineer = data[0].id; + this.roleForm.qualityEngineerName = data[0].name; + this.listForm.qualityEngineer = data[0].id; + this.listForm.qualityEngineerName = data[0].name; } else if (this.type === "certifiedEngineer") { - this.roleForm.certifiedEngineer = this.roleRow.id; - this.roleForm.certifiedEngineerName = this.roleRow.name; - this.listForm.certifiedEngineer = this.roleForm.certifiedEngineer; - this.listForm.certifiedEngineerName = this.roleForm.certifiedEngineerName; + this.roleForm.certifiedEngineer = data[0].id; + this.roleForm.certifiedEngineerName = data[0].name; + this.listForm.certifiedEngineer = data[0].id; + this.listForm.certifiedEngineerName = data[0].name; } else if (this.type === "distributePerson") { - this.listForm.distributePerson = this.roleRow.name; - this.listForm.dataList[this.dsadadadsada].distributePersonId=this.roleRow.id - this.listForm.dataList[this.dsadadadsada].distributePerson=this.roleRow.name + this.listForm.distributePerson = data[0].name; + this.listForm.dataList[this.dsadadadsada].distributePersonId= data[0].id + this.listForm.dataList[this.dsadadadsada].distributePerson= data[0].name this.showColumn = false; this.$nextTick(() => { this.showColumn = true @@ -611,7 +590,7 @@ export default { let _formData = new FormData(); _formData.append("createUser", this.$store.getters.userInfo.userId); _formData.append("createUserName", this.$store.getters.userInfo.uName); - _formData.append("prcType", this.$route.query.type); + _formData.append("prcType", '5'); _formData.append("json", JSON.stringify({ prcForm: this.prcForm, sarAccessInfoList: this.sarAccessInfoList, @@ -635,7 +614,7 @@ export default { } else { var json = Object.assign(this.listForm, this.roleForm) json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.account; + json.prcCreateUserName = this.$store.getters.userInfo.uName; json.standId = this.listForm.standId; json.XCXSSRQ = this.sarAccessListDatas[0].xcxssrqgj json.ZCCSSRQ = this.sarAccessListDatas[0].zccssrqgj diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 307ae7832..7c9ef4c0b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -37,16 +37,16 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 22b171a3f..fbe139e45 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -39,14 +39,14 @@ @@ -56,6 +56,9 @@
+
+ 批量分发落实人 +
{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }} - -