From ceec89801ad69708c33babb90d4f9d9ebfd8e3f9 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 27 八月 2026 16:20:42 +0800
Subject: [PATCH] fix(order): -移除英文字段验证 - 删除与OA流程相关的无用代码和组件 - 移除系统用户管理中的获取三方人员功能 - 更新设备二维码链接使用动态API地址 - 清理不合格处理页面中的OA相关功能和字段 - 移除登录页面的集团集成登录按钮 - 删除未使用的API接口和组件引用
---
src/components/Table/lims-table.vue | 2
src/views/business/unpass/index.vue | 20 --
src/permission.js | 2
src/api/login.js | 23 --
src/api/system/user.js | 23 --
src/views/system/customer/index.vue | 2
src/store/modules/user.js | 19 --
src/views/CNAS/resourceDemand/device/component/files.vue | 5
src/views/CNAS/resourceDemand/device/component/management.vue | 12 -
src/views/CNAS/process/method/standardMethod/index.vue | 3
src/router/index.js | 12 -
/dev/null | 22 --
src/views/performance/manHour/workTimeStatistics.vue | 6
src/views/system/user/index.vue | 173 -------------------
src/api/business/unpass.js | 2
src/views/login.vue | 10
src/views/business/productOrder/components/addOrder.vue | 3
src/views/CNAS/process/demand/index.vue | 2
src/views/business/productOrder/components/addView.vue | 3
src/api/business/unqualifiedHandler.js | 16 -
src/utils/date.js | 4
src/views/business/unpass/index-manage.vue | 133 +-------------
src/views/structural/capabilityAndLaboratory/capability/index.vue | 3
23 files changed, 31 insertions(+), 469 deletions(-)
diff --git a/src/api/business/unpass.js b/src/api/business/unpass.js
index 2aa3648..1b14eda 100644
--- a/src/api/business/unpass.js
+++ b/src/api/business/unpass.js
@@ -46,7 +46,7 @@
});
}
-// 鏌ョ湅OA璇︽儏
+// 鏌ョ湅涓嶅悎鏍煎鐞嗚鎯�
export function getUnqualifiedHandler(query) {
return request({
url: "/unqualifiedHandler/getUnqualifiedHandler",
diff --git a/src/api/business/unqualifiedHandler.js b/src/api/business/unqualifiedHandler.js
index b736cc1..4af65d7 100644
--- a/src/api/business/unqualifiedHandler.js
+++ b/src/api/business/unqualifiedHandler.js
@@ -17,19 +17,3 @@
params: query,
});
}
-//鎻愪氦OA娴佺▼
-export function pushOA(query) {
- return request({
- url: "/unqualifiedHandler/pushOA",
- method: "post",
- data: query,
- });
-}
-//鏌ョ湅OA娴佺▼
-export function getOaFlow(query) {
- return request({
- url: "/unqualifiedHandler/getOaFlow",
- method: "get",
- params: query,
- });
-}
diff --git a/src/api/login.js b/src/api/login.js
index 2635b7f..9b71d78 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -19,27 +19,6 @@
})
}
-// 鑾峰彇鍗曠偣鐧诲綍鍦板潃
-export function getSsoAuthUrl() {
- return request({
- url: '/getSsoAuthUrl',
- method: 'get'
- })
-}
-
-// 鍗曠偣鐧诲綍
-export function LoginBySSO(accessToken) {
- return request({
- url: '/loginBySSO',
- headers: {
- isToken: false,
- repeatSubmit: false
- },
- method: 'post',
- params: accessToken
- })
-}
-
// 娉ㄥ唽鏂规硶
export function register(data) {
return request({
@@ -78,4 +57,4 @@
method: 'get',
timeout: 20000
})
-}
\ No newline at end of file
+}
diff --git a/src/api/system/user.js b/src/api/system/user.js
index ad8d3ce..cedc50c 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -135,29 +135,6 @@
});
}
-// 鑾峰彇浜轰簨绯荤粺缁勭粐
-export function selectCompaniesList() {
- return request({
- url: "/companies/selectCompaniesList",
- method: "get",
- });
-}
-// 鑾峰彇浜轰簨绯荤粺缁勭粐涓嬬殑浜哄憳
-export function selectSimpleList(data) {
- return request({
- url: "/companies/selectSimpleList",
- method: "post",
- params: data,
- });
-}
-// 鑾峰彇浜轰簨绯荤粺缁勭粐涓嬬殑浜哄憳
-export function addPersonUser(data) {
- return request({
- url: "/companies/addPersonUser",
- method: "post",
- data: data,
- });
-}
// 鑾峰彇瑙掕壊
export function selectRoleList() {
return request({
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index dc998e7..2c36721 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -162,7 +162,7 @@
// plain锛氭寜elementUi 鏂囨。涓哄噯
// clickFun锛氭寜閽殑鍥炶皟鍑芥暟
export default {
- name: "ZTTable",
+ name: "LimsTable",
filters: {
typeFn(val, row) {
if (typeof val === "function") {
diff --git a/src/permission.js b/src/permission.js
index dbae342..b66190b 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
NProgress.configure({ showSpinner: false })
-const whiteList = ['/login', '/register', '/thirdpartylogin', '/logindemo']
+const whiteList = ['/login', '/register']
const isWhiteList = (path) => {
return whiteList.some(pattern => isPathMatch(pattern, path))
diff --git a/src/router/index.js b/src/router/index.js
index 28b3e63..fb1442b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,18 +46,6 @@
component: () => import("@/views/login"),
hidden: true,
},
- // 绗笁鏂圭櫥褰曢〉
- {
- path: "/thirdpartylogin",
- component: () => import("@/views/thirdpartylogin"),
- hidden: true,
- },
- // 绗笁鏂圭櫥褰曢〉涓浆
- {
- path: "/logindemo",
- component: () => import("@/views/logindemo"),
- hidden: true,
- },
{
path: "/register",
component: () => import("@/views/register"),
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 06acd91..68d8fcb 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,4 +1,4 @@
-import { login, logout, getInfo, LoginBySSO } from "@/api/login";
+import { login, logout, getInfo } from "@/api/login";
import { getToken, setToken, removeToken } from "@/utils/auth";
import { isHttp, isEmpty } from "@/utils/validate";
import defAva from "@/assets/images/profile.jpg";
@@ -68,23 +68,6 @@
reject(error);
});
});
- },
- // 鍗曠偣鐧诲綍
- LoginBySSO({ commit }, accessToken) {
- return new Promise((resolve, reject) => {
- LoginBySSO(accessToken)
- .then((res) => {
- setToken(res.token);
- commit("SET_TOKEN", res.token);
- Vue.prototype.uploadHeader = {
- Authorization: "Bearer " + res.token,
- };
- resolve();
- })
- .catch((error) => {
- reject(error);
- });
- })
},
// 鑾峰彇鐢ㄦ埛淇℃伅
GetInfo({ commit, state }) {
diff --git a/src/utils/date.js b/src/utils/date.js
index 6d2c1a5..eae259f 100644
--- a/src/utils/date.js
+++ b/src/utils/date.js
@@ -58,7 +58,7 @@
* @param date
* @returns {string}
*/
-export function getYearAndMonthAndDaysZTZB(date = new Date()) {
+export function getPayrollMonthDate(date = new Date()) {
let year = date.getFullYear();
let month = date.getMonth();
let days = date.getDate();
@@ -78,4 +78,4 @@
days = days < 10 ? '0' + days : days;
return (year + month + days);
-}
\ No newline at end of file
+}
diff --git a/src/views/CNAS/process/demand/index.vue b/src/views/CNAS/process/demand/index.vue
index b60e1bc..7bf37d2 100644
--- a/src/views/CNAS/process/demand/index.vue
+++ b/src/views/CNAS/process/demand/index.vue
@@ -115,7 +115,7 @@
</tr>
<tr>
<td>
- <p>璁板綍缂栧彿锛� ZTT/QR-16-04-a</p>
+ <p>璁板綍缂栧彿锛�</p>
</td>
<td>
<p>褰掓。閮ㄩ棬锛氱患鍚堝</p>
diff --git a/src/views/CNAS/process/method/standardMethod/index.vue b/src/views/CNAS/process/method/standardMethod/index.vue
index d07803f..80cfd50 100644
--- a/src/views/CNAS/process/method/standardMethod/index.vue
+++ b/src/views/CNAS/process/method/standardMethod/index.vue
@@ -191,9 +191,6 @@
addRules: {
code: [{ required: true, message: "璇疯緭鍏ユ爣鍑嗙紪鍙�", trigger: "blur" }],
name: [{ required: true, message: "璇疯緭鍏ユ爣鍑嗘弿杩�", trigger: "blur" }],
- nameEn: [
- { required: true, message: "璇疯緭鍏ユ爣鍑嗘弿杩癊N", trigger: "blur" },
- ],
isProduct: [
{ required: true, message: "璇烽�夋嫨鏄惁浜у搧鏍囧噯", trigger: "change" },
],
diff --git a/src/views/CNAS/resourceDemand/device/component/files.vue b/src/views/CNAS/resourceDemand/device/component/files.vue
index 3a96e5a..415275d 100644
--- a/src/views/CNAS/resourceDemand/device/component/files.vue
+++ b/src/views/CNAS/resourceDemand/device/component/files.vue
@@ -426,7 +426,7 @@
<div class="device-footer">
<div>
<vueQr class="qr-code"
- :text="'https://zttx-lims.ztt.cn:8021/lims/qr/qrScan?code=' + Mdata.managementNumber + '&type=device'"
+ :text="javaApi + '/qr/qrScan?code=' + Mdata.managementNumber + '&type=device'"
:size="200" :margin="10"></vueQr>
</div>
<div class="device-number">
@@ -491,9 +491,6 @@
rules1: {
deviceName: [
{ required: true, message: '璇疯緭鍏ヤ华鍣ㄥ悕绉�', trigger: 'blur' },
- ],
- enDeviceName: [
- { required: true, message: '璇疯緭鍏ヤ华鍣ㄥ悕绉癊N', trigger: 'blur' },
],
specificationModel: [
{ required: true, message: '璇疯緭鍏ヨ鏍煎瀷鍙�', trigger: 'blur' },
diff --git a/src/views/CNAS/resourceDemand/device/component/management.vue b/src/views/CNAS/resourceDemand/device/component/management.vue
index 0dcc8a5..745aade 100644
--- a/src/views/CNAS/resourceDemand/device/component/management.vue
+++ b/src/views/CNAS/resourceDemand/device/component/management.vue
@@ -59,7 +59,7 @@
<el-form-item label="浠櫒鍚嶇О:" required prop="deviceName">
<el-input :disabled="isUp" v-model="formData.deviceName" size="small"></el-input>
</el-form-item>
- <el-form-item label="浠櫒鍚嶇ОEN:" required>
+ <el-form-item label="浠櫒鍚嶇ОEN:">
<el-input :disabled="isUp" v-model="formData.enDeviceName" size="small"></el-input>
</el-form-item>
<el-form-item label="瑙勬牸鍨嬪彿:" required>
@@ -216,7 +216,7 @@
<el-form-item label="浠櫒鍚嶇О:" required>
<el-input v-model="formData2.deviceName" size="small"></el-input>
</el-form-item>
- <el-form-item label="浠櫒鍚嶇ОEN:" required>
+ <el-form-item label="浠櫒鍚嶇ОEN:">
<el-input v-model="formData2.enDeviceName" size="small"></el-input>
</el-form-item>
<el-form-item label="瑙勬牸鍨嬪彿:" required>
@@ -781,10 +781,6 @@
this.$message.error('鏈緭鍏ヤ华鍣ㄥ悕绉�')
return
}
- if (!this.formData.enDeviceName) {
- this.$message.error('鏈緭鍏ヤ华鍣ㄥ悕绉癊N')
- return
- }
if (!this.formData.specificationModel) {
this.$message.error('鏈緭鍏ヨ鏍煎瀷鍙�')
return
@@ -836,10 +832,6 @@
submitForm2() {
if (!this.formData2.deviceName) {
this.$message.error('鏈緭鍏ヤ华鍣ㄥ悕绉�')
- return
- }
- if (!this.formData2.enDeviceName) {
- this.$message.error('鏈緭鍏ヤ华鍣ㄥ悕绉癊N')
return
}
if (!this.formData2.specificationModel) {
diff --git a/src/views/business/productOrder/components/addOrder.vue b/src/views/business/productOrder/components/addOrder.vue
index 67b582d..7a01f3e 100644
--- a/src/views/business/productOrder/components/addOrder.vue
+++ b/src/views/business/productOrder/components/addOrder.vue
@@ -695,9 +695,6 @@
production: [
{ required: true, message: '璇峰～鍐欑敓浜у崟浣�', trigger: 'blur' }
],
- productionEn: [
- { required: true, message: '璇峰～鍐欑敓浜у崟浣岴N', trigger: 'blur' }
- ],
},
sample: {
sampleCode: null,
diff --git a/src/views/business/productOrder/components/addView.vue b/src/views/business/productOrder/components/addView.vue
index 52cf05d..4f1d05b 100644
--- a/src/views/business/productOrder/components/addView.vue
+++ b/src/views/business/productOrder/components/addView.vue
@@ -689,9 +689,6 @@
production: [
{ required: true, message: '璇峰～鍐欑敓浜у崟浣�', trigger: 'blur' }
],
- productionEn: [
- { required: true, message: '璇峰～鍐欑敓浜у崟浣岴N', trigger: 'blur' }
- ],
},
sample: {
sampleCode: null,
diff --git a/src/views/business/unpass/components/OAProcess.vue b/src/views/business/unpass/components/OAProcess.vue
deleted file mode 100644
index 5b0b616..0000000
--- a/src/views/business/unpass/components/OAProcess.vue
+++ /dev/null
@@ -1,252 +0,0 @@
-<template>
- <div>
- <el-dialog :close-on-press-escape="false" :visible.sync="isShow" title="涓嶅悎鏍煎鐞�"
- width="1040px"
- @close="$emit('closeOAProcess')">
-
- <table :border='true' class="table">
- <tr>
- <th class="th-title">1妫�楠屽憳</th>
- <th class="th-titleSec">澶勭悊缁撴灉</th>
- <th class="th-info1">{{oneOperation}}</th>
- <th class="th-titleSec">澶勭悊鎰忚</th>
- <th class="th-info" colspan="3">{{oneInfo}}</th>
- <th style="display:none;"></th>
- <th style="display:none;"></th>
- <th >{{oneName}}<span v-if="oneName">锛�</span>{{oneTime}}</th>
- </tr>
- <tr>
- <th class="th-title">2妫�娴嬩富绠＄‘璁�</th>
- <th class="th-titleSec">澶勭悊缁撴灉</th>
- <th class="th-info1">{{twoOperation}}</th>
- <th class="th-titleSec">澶勭悊鎰忚</th>
- <th class="th-info" colspan="3">{{twoInfo}}</th>
- <th style="display:none;"></th>
- <th style="display:none;"></th>
- <th >{{twoName}}<span v-if="twoName">锛�</span>{{twoTime}}</th>
- </tr>
- <tr>
- <th class="th-title">3鐗╂祦閮ㄧ‘璁�</th>
- <th class="th-titleSec">澶勭悊缁撴灉</th>
- <th class="th-info1">{{threeOperation}}</th>
- <th class="th-titleSec">澶勭悊鎰忚</th>
- <th class="th-info" colspan="3">{{threeInfo}}</th>
- <th style="display:none;"></th>
- <th style="display:none;"></th>
- <th >{{threeName}}<span v-if="threeName">锛�</span>{{threeTime}}</th>
- </tr>
- <tr>
- <th class="th-title">4浜у搧宸ョ▼甯堝鐞嗘剰瑙�</th>
- <th class="th-titleSec">澶勭悊缁撴灉</th>
- <th class="th-info1">{{fourOperation}}</th>
- <th class="th-titleSec">澶勭悊鎰忚</th>
- <th class="th-info" colspan="3">{{fourInfo}}</th>
- <th style="display:none;"></th>
- <th style="display:none;"></th>
- <th >{{fourName}}<span v-if="fourName">锛�</span>{{fourTime}}</th>
- </tr>
- <tr>
- <th class="th-title">5.鎬诲伐鎴栬�呭壇缁忕悊鐨勫鐞嗘剰瑙�</th>
- <th class="th-titleSec">澶勭悊缁撴灉</th>
- <th class="th-info1">{{fiveOperation}}</th>
- <th class="th-titleSec">澶勭悊鎰忚</th>
- <th class="th-info" colspan="3">{{fiveInfo}}</th>
- <th style="display:none;"></th>
- <th style="display:none;"></th>
- <th >{{fiveName}}<span v-if="fiveName">锛�</span>{{fiveTime}}</th>
- </tr>
- <tr>
- <th class="th-title">6璐ㄩ噺閮�</th>
- <th class="th-titleSec">澶勭悊缁撴灉</th>
- <th class="th-info1">{{sixOperation}}</th>
- <th class="th-titleSec">澶勭悊鎰忚</th>
- <th class="th-info" colspan="3">{{sixInfo}}</th>
- <th style="display:none;"></th>
- <th style="display:none;"></th>
- <th >{{sixName}}<span v-if="sixName">锛�</span>{{sixTime}}</th>
- </tr>
- <tr>
- <th class="th-title">7璐ㄩ噺閮ㄧ粡鐞�</th>
- <th class="th-titleSec">澶勭悊缁撴灉</th>
- <th class="th-info1">{{sevenOperation}}</th>
- <th class="th-titleSec">澶勭悊鎰忚</th>
- <th class="th-info" colspan="3">{{sevenInfo}}</th>
- <th style="display:none;"></th>
- <th style="display:none;"></th>
- <th >{{sevenName}}<span v-if="sevenName">锛�</span>{{sevenTime}}</th>
- </tr>
- <tr>
- <th class="th-title">8鏍哥畻鍛�</th>
- <th class="th-titleSec">澶勭悊缁撴灉</th>
- <th class="th-info1">{{eightOperation}}</th>
- <th class="th-titleSec">澶勭悊鎰忚</th>
- <th class="th-info" colspan="3">{{eightInfo}}</th>
- <th style="display:none;"></th>
- <th style="display:none;"></th>
- <th >{{eightName}}<span v-if="eightName">锛�</span>{{eightTime}}</th>
- </tr>
- <tr>
- <th class="th-title">9鐗╂祦閮ㄧ储璧旂粨鏋�</th>
- <th class="th-titleSec">澶勭悊缁撴灉</th>
- <th class="th-info1">{{nineOperation}}</th>
- <th class="th-titleSec">澶勭悊鎰忚</th>
- <th class="th-info" colspan="3">{{nineInfo}}</th>
- <th style="display:none;"></th>
- <th style="display:none;"></th>
- <th >{{nineName}}<span v-if="nineName">锛�</span>{{nineTime}}</th>
- </tr>
- </table>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import {getOaFlow} from "../../../../api/business/unqualifiedHandler";
-
-export default {
- name: "OAProcess",
- // import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: {},
- props: {
- OAProcess: {
- type: Boolean,
- default: () => false
- },
- },
- data() {
- // 杩欓噷瀛樻斁鏁版嵁
- return {
- isShow: this.OAProcess,
- oneInfo: '',
- twoInfo: '',
- threeInfo: '',
- fourInfo: '',
- fiveInfo: '',
- sixInfo: '',
- sevenInfo: '',
- eightInfo: '',
- nineInfo: '',
- oneTime: '',
- twoTime: '',
- threeTime: '',
- fourTime: '',
- fiveTime: '',
- sixTime: '',
- sevenTime: '',
- eightTime: '',
- nineTime: '',
- oneName: '',
- twoName: '',
- threeName: '',
- fourName: '',
- fiveName: '',
- sixName: '',
- sevenName: '',
- eightName: '',
- nineName: '',
- oneOperation: '',
- twoOperation: '',
- threeOperation: '',
- fourOperation: '',
- fiveOperation: '',
- sixOperation: '',
- sevenOperation: '',
- eightOperation: '',
- nineOperation: '',
- }
- },
- // 鏂规硶闆嗗悎
- methods: {
- getInfo (id) {
- getOaFlow({
- id: id
- }).then(res => {
- if (res.code === 200) {
- const data = res.data
- if (data.length > 0) {
- data.forEach(item => {
- if (item.nodeName === '1妫�楠屽憳') {
- this.oneInfo = item.approvalOpinion
- this.oneTime = item.approvalDate
- this.oneName = item.approver
- this.oneOperation = item.operation
- } else if (item.nodeName === '2妫�娴嬩富绠＄‘璁�') {
- this.twoInfo = item.approvalOpinion
- this.twoTime = item.approvalDate
- this.twoName = item.approver
- this.twoOperation = item.operation
- } else if (item.nodeName === '3鐗╂祦閮ㄧ‘璁�') {
- this.threeInfo = item.approvalOpinion
- this.threeTime = item.approvalDate
- this.threeName = item.approver
- this.threeOperation = item.operation
- } else if (item.nodeName === '4浜у搧宸ョ▼甯堝鐞嗘剰瑙�') {
- this.fourInfo = item.approvalOpinion
- this.fourTime = item.approvalDate
- this.fourName = item.approver
- this.fourOperation = item.operation
- } else if (item.nodeName === '5.鎬诲伐鎴栬�呭壇缁忕悊鐨勫鐞嗘剰瑙�') {
- this.fiveInfo = item.approvalOpinion
- this.fiveTime = item.approvalDate
- this.fiveName = item.approver
- this.fiveOperation = item.operation
- } else if (item.nodeName === '6璐ㄩ噺閮�') {
- this.sixInfo = item.approvalOpinion
- this.sixTime = item.approvalDate
- this.sixName = item.approver
- this.sixOperation = item.operation
- } else if (item.nodeName === '7璐ㄩ噺閮ㄧ粡鐞�') {
- this.sevenInfo = item.approvalOpinion
- this.sevenTime = item.approvalDate
- this.sevenName = item.approver
- this.sevenOperation = item.operation
- } else if (item.nodeName === '8鏍哥畻鍛�') {
- this.eightInfo = item.approvalOpinion
- this.eightTime = item.approvalDate
- this.eightName = item.approver
- this.eightOperation = item.operation
- } else if (item.nodeName === '9鐗╂祦閮ㄧ储璧旂粨鏋�') {
- this.nineInfo = item.approvalOpinion
- this.nineTime = item.approvalDate
- this.nineName = item.approver
- this.nineOperation = item.operation
- }
- })
- }
- }
- }).catch(err => {
- this.submitDeclareLoading = false
- console.log(err)
- })
- }
- },
-}
-</script>
-
-<style scoped>
-.table {
- width: 100%;
- height: 500px;
-}
-.th-title {
- width: 160px;
- text-align: left;
- background-color: #e0eaf5;
- font-size: 16px;
-}
-.th-titleSec {
- width: 70px;
- background-color: #e0eaf5;
- font-size: 16px;
-}
-.th-info {
- width: 210px;
- text-align: left;
- font-size: 16px;
-}
-.th-info1 {
- width: 100px;
- text-align: center;
- font-size: 16px;
-}
-</style>
diff --git a/src/views/business/unpass/index-manage.vue b/src/views/business/unpass/index-manage.vue
index 12c203a..0e07476 100644
--- a/src/views/business/unpass/index-manage.vue
+++ b/src/views/business/unpass/index-manage.vue
@@ -28,52 +28,33 @@
:page="page" :tableLoading="tableLoading"></lims-table>
</div>
<el-dialog
- title="鎻愪氦"
- :show-close="false"
- :close-on-press-escape="false"
- :close-on-click-modal="false"
- :visible.sync="dialogVisible"
- width="30%">
- <span>鏄惁纭鎻愪氦OA锛�</span>
- <span slot="footer" class="dialog-footer">
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="submitOA" :loading="submitOALoading">纭� 瀹�</el-button>
- </span>
- </el-dialog>
- <el-dialog
title="鍒犻櫎"
:show-close="false"
:close-on-press-escape="false"
:close-on-click-modal="false"
:visible.sync="deleteVisible"
width="30%">
- <span>鏄惁纭<span style="color: #FF4902">鍒犻櫎</span>OA锛�</span>
+ <span>鏄惁纭<span style="color: #FF4902">鍒犻櫎</span>璇ヨ褰曪紵</span>
<span slot="footer" class="dialog-footer">
<el-button @click="deleteVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="cancelOA" :loading="cancelOALoading">纭� 瀹�</el-button>
+ <el-button type="primary" @click="deleteRecord" :loading="deleteLoading">纭� 瀹�</el-button>
</span>
</el-dialog>
<UnPassDialog ref="unPassDialog" v-if="unPassDialog"
:orderId="orderId"
@resetForm="resetForm1"
:unPassDialog="unPassDialog"></UnPassDialog>
- <OAProcess ref="OAProcess"
- :OAProcess="OAProcess"
- @closeOAProcess="closeOAProcess"
- v-if="OAProcess"></OAProcess>
</div>
</template>
<script>
import UnPassDialog from "./components/unPassDialog.vue";
-import OAProcess from "./components/OAProcess.vue";
import limsTable from "@/components/Table/lims-table.vue";
-import {deleteUnqualifiedHandler, page, pushOA} from "@/api/business/unqualifiedHandler";
+import {deleteUnqualifiedHandler, page} from "@/api/business/unqualifiedHandler";
export default {
components: {
limsTable,
- OAProcess,
UnPassDialog,
},
data() {
@@ -87,34 +68,6 @@
tableLoading: false,
column: [
{ label: '缂栧彿', prop: 'no', width: "160px", },
- // {
- // label: "OA瀹℃牳鐘舵��",
- // prop: "oaState",
- // width: "100px",
- // dataType: "tag",
- // formatData: (params) => {
- // if (params == 1) {
- // return "寰呭鏍�";
- // } else if(params == 2) {
- // return "瀹℃牳涓�";
- // } else if(params == 3) {
- // return "閫氳繃";
- // } else {
- // return "椹冲洖";
- // }
- // },
- // formatType: (params) => {
- // if (params == 1) {
- // return "warning";
- // } else if(params == 2) {
- // return "info";
- // } else if(params == 3) {
- // return "success";
- // } else {
- // return "danger";
- // }
- // },
- // },
{ label: '璁㈠崟鍙�', prop: 'orderNo' },
{
label: "闆朵欢鍙�",
@@ -190,36 +143,10 @@
width: '180px',
operation: [
{
- name: '鎻愪氦OA',
- type: 'text',
- clickFun: (row) => {
- this.openOA(row);
- },
- disabled: (row, index) => {
- return row.requestId !== null // 鏈塺equestId璇存槑宸茬粡鎻愪氦杩嘜A锛屼笉鍙啀娆℃彁浜�
- },
- showHide: (row) => {
- return this.checkPermi(["unpass:add"]);
- },
- },
- {
- name: '鏌ョ湅OA娴佺▼',
- type: 'text',
- clickFun: (row) => {
- this.OAView(row);
- },
- showHide: (row) => {
- return this.checkPermi(["unpass:view"]);
- },
- },
- {
name: '鍒犻櫎',
type: 'text',
clickFun: (row) => {
- this.deleteOA(row);
- },
- disabled: (row, index) => {
- return row.requestId !== null // 鏈塺equestId璇存槑宸茬粡鎻愪氦杩嘜A锛屼笉鍙啀娆℃彁浜�
+ this.openDelete(row);
},
showHide: (row) => {
return this.checkPermi(["unpass:delete"]);
@@ -234,13 +161,10 @@
current: 1
},
statusList: [],
- dialogVisible: false, // 纭鎻愪氦OA寮规
unPassDialog: false, // 涓嶅悎鏍煎鐞嗗脊妗�
orderId: '',
- OAProcess: false, // OA娴佺▼寮规
- submitOALoading: false, // OA娴佺▼寮规鎻愪氦鎸夐挳loading
- deleteVisible: false, // OA娴佺▼鍒犻櫎寮规
- cancelOALoading: false, // OA娴佺▼鍒犻櫎寮规鎻愪氦鎸夐挳loading
+ deleteVisible: false, // 鍒犻櫎纭寮规
+ deleteLoading: false, // 鍒犻櫎鎸夐挳loading
};
},
mounted() {
@@ -279,58 +203,27 @@
this.$refs.unPassDialog.$refs['unPassForm'].resetFields();
this.unPassDialog = false
},
- // 鎵撳紑鍒犻櫎OA纭寮规
- deleteOA (row) {
+ // 鎵撳紑鍒犻櫎纭寮规
+ openDelete (row) {
this.handlerId = row.handlerId
this.deleteVisible = true
},
- // 鎻愪氦鍒犻櫎鐢宠
- cancelOA () {
+ // 鍒犻櫎璁板綍
+ deleteRecord () {
this.de = true
deleteUnqualifiedHandler({id: this.handlerId,}).then(res => {
- this.cancelOALoading = false
+ this.deleteLoading = false
if (res.code === 200) {
this.deleteVisible = false
this.$message.success('鍒犻櫎鎴愬姛')
this.refreshTable('page')
}
}).catch(error => {
- this.cancelOALoading = false
+ this.deleteLoading = false
console.error(error);
});
},
- // 鏌ョ湅鎻愪氦OA鐨勬暟鎹�
- openOA (row) {
- this.handlerId = row.handlerId
- this.dialogVisible = true
- },
- // 鏌ョ湅OA娴佺▼
- OAView (row) {
- this.OAProcess = true
- this.$nextTick(() => {
- this.$refs.OAProcess.getInfo(row.handlerId)
- })
- },
- // 鍏抽棴鏌ョ湅OA娴佺▼鐨勫脊妗�
- closeOAProcess () {
- this.OAProcess = false
- },
- //鎻愪氦OA
- submitOA(row) {
- // 鎻愪氦OA
- this.submitOALoading = true
- pushOA({handlerId: this.handlerId,}).then(res => {
- this.submitOALoading = false
- if (res.code === 200) {
- this.dialogVisible = false
- this.$message.success('鎻愪氦鎴愬姛')
- this.refreshTable('page')
- }
- }).catch(error => {
- this.submitOALoading = false
- console.error(error);
- });
- }
}
};
</script>
+
diff --git a/src/views/business/unpass/index.vue b/src/views/business/unpass/index.vue
index 347357d..e1eeaa3 100644
--- a/src/views/business/unpass/index.vue
+++ b/src/views/business/unpass/index.vue
@@ -43,26 +43,6 @@
tableLoading: false,
column: [
{ label: '缂栧彿', prop: 'no' },
- // {
- // label: "OA瀹℃牳鐘舵��",
- // prop: "oaState",
- // width: "100px",
- // dataType: "tag",
- // formatData: (params) => {
- // if (params == 0) {
- // return "鍚�";
- // } else {
- // return "鏄�";
- // }
- // },
- // formatType: (params) => {
- // if (params == 0) {
- // return "danger";
- // } else {
- // return "primary";
- // }
- // },
- // },
{
dataType: 'action',
fixed: 'right',
diff --git a/src/views/login.vue b/src/views/login.vue
index f326de1..f4e2ab3 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -38,7 +38,6 @@
<router-link class="link-type" :to="'/register'">绔嬪嵆娉ㄥ唽</router-link>
</div>
</el-form-item>
- <el-button v-if="true" type="primary" plain @click="goLogin">闆嗗洟闆嗘垚鐧诲綍</el-button>
</el-form>
</div>
<!-- 搴曢儴 -->
@@ -49,7 +48,7 @@
</template>
<script>
-import { getCodeImg, getSsoAuthUrl } from "@/api/login";
+import { getCodeImg } from "@/api/login";
import { encrypt, decrypt } from '@/utils/jsencrypt'
export default {
@@ -58,7 +57,7 @@
return {
codeUrl: "",
loginForm: {
- username: "ZT-",
+ username: "",
password: "",
rememberMe: false,
code: "",
@@ -94,11 +93,6 @@
// this.getCookie();
},
methods: {
- async goLogin() {
- await getSsoAuthUrl().then(res => {
- window.location.href = res.data
- })
- },
getCode() {
getCodeImg().then(res => {
this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
diff --git a/src/views/logindemo.vue b/src/views/logindemo.vue
deleted file mode 100644
index 1798948..0000000
--- a/src/views/logindemo.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
- <div></div>
-</template>
-<script>
-import { getSsoAuthUrl } from '@/api/login'
-export default {
- data() {
- return {}
- },
- created() {
- this.goLogin()
- },
- computed: {},
- methods: {
- async goLogin() {
- await getSsoAuthUrl().then(res => {
- window.location.href = res.data
- })
- }
- }
-}
-</script>
-<style scoped></style>
diff --git a/src/views/performance/manHour/workTimeStatistics.vue b/src/views/performance/manHour/workTimeStatistics.vue
index 422aa61..04e99c1 100644
--- a/src/views/performance/manHour/workTimeStatistics.vue
+++ b/src/views/performance/manHour/workTimeStatistics.vue
@@ -48,7 +48,7 @@
</template>
<script>
-import { getYearAndMonthAndDays, getYearAndMonthAndDaysZTZB } from "@/utils/date";
+import { getYearAndMonthAndDays, getPayrollMonthDate } from "@/utils/date";
import limsTable from "@/components/Table/lims-table.vue";
import { selectAuxiliaryAllByMonth } from "@/api/performance/manHour";
export default {
@@ -58,7 +58,7 @@
data() {
return {
queryParams: {
- month: getYearAndMonthAndDaysZTZB().slice(0, 7),
+ month: getPayrollMonthDate().slice(0, 7),
name: "",
departLims: "",
},
@@ -115,7 +115,7 @@
},
refresh() {
this.queryParams = {
- month: getYearAndMonthAndDaysZTZB().slice(0, 7),
+ month: getPayrollMonthDate().slice(0, 7),
name: "",
departLims: "",
};
diff --git a/src/views/structural/capabilityAndLaboratory/capability/index.vue b/src/views/structural/capabilityAndLaboratory/capability/index.vue
index 9936cf6..47361c1 100644
--- a/src/views/structural/capabilityAndLaboratory/capability/index.vue
+++ b/src/views/structural/capabilityAndLaboratory/capability/index.vue
@@ -372,8 +372,7 @@
},
objectId: '',
productRules: {
- name: [{ required: true, message: '璇峰～鍐欎骇鍝佸悕绉�', trigger: 'blur' }],
- nameEn: [{ required: true, message: '璇峰～鍐欎骇鍝佸悕绉癊N', trigger: 'blur' }]
+ name: [{ required: true, message: '璇峰～鍐欎骇鍝佸悕绉�', trigger: 'blur' }]
},
uploadDia: false,
fileList: [],
diff --git a/src/views/system/customer/index.vue b/src/views/system/customer/index.vue
index 28f4d95..1e400c9 100644
--- a/src/views/system/customer/index.vue
+++ b/src/views/system/customer/index.vue
@@ -119,9 +119,7 @@
},
userRules: {
company: [{ required: true, message: '璇疯緭鍏ュ鎴峰悕绉�', trigger: 'blur' }],
- companyEn: [{ required: true, message: '璇疯緭鍏ュ鎴峰悕绉癊N', trigger: 'blur' }],
address: [{ required: true, message: '璇疯緭鍏ュ崟浣嶅湴鍧�', trigger: 'blur' }],
- addressEn: [{ required: true, message: '璇疯緭鍏ュ崟浣嶅湴鍧�EN', trigger: 'blur' }],
num: [{ required: true, message: '璇疯緭鍏ュ姞鎬ラ搴�', trigger: 'blur' }],
code2: [{ required: true, message: '璇疯緭鍏ュ鎴风紪鍙�', trigger: 'blur' }],
},
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 643824b..1ddcb8f 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -40,8 +40,6 @@
</el-form>
</div>
<div class="options_button">
- <el-button type="primary" size="mini" @click="openthirdParty"
- v-hasPermi="['system:user:add']">鑾峰彇涓夋柟浜哄憳</el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:user:add']">鏂板鐢ㄦ埛</el-button>
</div>
@@ -206,49 +204,6 @@
</div>
</el-dialog>
- <!-- 鑾峰彇浜轰簨绯荤粺浜哄憳淇℃伅 -->
- <el-dialog title="鑾峰彇浜轰簨绯荤粺浜哄憳淇℃伅" :visible.sync="addthirdParty" width="70%">
- <div class="body" v-loading="thirdPartyLoading">
- <el-row>
- <el-col :span="8" style="height: 70vh;overflow: hidden;" v-if="companiesList.length != 1">
- <el-input v-model="search2" placeholder="杈撳叆鍏抽敭瀛楁悳绱�" clearable size="small" @clear="searchFilter2"
- @keyup.enter.native="searchFilter2" prefix-icon="el-icon-search" style="margin-bottom: 20px;width: 90%" />
- <el-tree :data="datathirdParty" node-key="companyId" :props="defaultProps1" @node-click="nodeClick2"
- style="height: calc(100% - 42px);" @node-expand="nodeOpen0" :filter-node-method="filterNode2" ref="tree2"
- highlight-current>
- </el-tree>
- </el-col>
- <el-col :span="companiesList.length == 1 ? 24 : 16" style="height: 70vh;padding-left: 8px;">
- <div style="display: flex;align-items: center;margin-bottom: 10px">
- <span style="width: 140px">鍛樺伐鍙�/鍛樺伐濮撳悕:</span>
- <el-input size="small" placeholder="璇疯緭鍏ュ憳宸ュ彿/鍛樺伐濮撳悕" @clear="searchPerson" clearable v-model="userSearch2"
- style="width: 50%" @keyup.enter.native="searchPerson()"></el-input>
- </div>
- <el-table height="67vh" stripe :data="personList" v-loading="personLoad" ref="personTable"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
- @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="50">
- </el-table-column>
- <el-table-column prop="employeeID" label="鍛樺伐鍙�">
- </el-table-column>
- <el-table-column prop="name" label="鍛樺伐濮撳悕">
- </el-table-column>
- <el-table-column prop="department" label="閮ㄩ棬" min-width="200">
- </el-table-column>
- <el-table-column prop="isLive" label="宸插瓨鍦�" width="80" align="center">
- <template slot-scope="scope">
- <el-tag type="success" effect="dark" v-if="scope.row.isLive === 1">鈭�</el-tag>
- </template>
- </el-table-column>
- </el-table>
- </el-col>
- </el-row>
- </div>
- <div slot="footer" class="dialog-footer">
- <el-button @click="addthirdParty = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="addUser2" :loading="addLoad">纭� 瀹�</el-button>
- </div>
- </el-dialog>
<el-dialog title="鏋舵瀯鏂板" :visible.sync="addDia" width="400px">
<div class="body">
<el-row style="line-height: 50px;">
@@ -278,7 +233,7 @@
resetUserPwd,
changeUserStatus,
deptTreeSelect,
- selectCompaniesList, selectSimpleList, addPersonUser, uploadFile, selectRoleList, selectCustomEnum, addDepartment
+ uploadFile, selectRoleList, selectCustomEnum, addDepartment
} from "@/api/system/user";
import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
@@ -331,10 +286,6 @@
children: "children",
label: "label"
},
- defaultProps1: {
- children: "children",
- label: "companyName"
- },
// 鐢ㄦ埛瀵煎叆鍙傛暟
upload: {
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鐢ㄦ埛瀵煎叆锛�
@@ -378,9 +329,6 @@
userName: [
{ required: true, message: "璇峰～鍐欒处鍙�", trigger: "blur" }
],
- // nameEn: [
- // { required: true, message: "璇疯緭鍏ュ鍚岴N", trigger: "blur" }
- // ],
status: [
{ required: true, message: "璇烽�夋嫨鐘舵��", trigger: "change" }
],
@@ -425,19 +373,7 @@
}
]
},
- // 鑾峰彇涓夋柟浜哄憳寮规
- addthirdParty: false,
- thirdPartyLoading: false,
- companiesList: [],
- search2: '',
- datathirdParty: [],
- currentCompaniesList: [],
- personList: [],
- personListCopy: [],
- personLoad: false,
- userSearch2: '',
addLoad: false,
- //
addDia: false, // 娣诲姞鏋舵瀯寮规
addOb: {
fatherId: 10001,
@@ -590,113 +526,6 @@
default:
break;
}
- },
- // 鑾峰彇涓夋柟浜哄憳
- async openthirdParty() {
- try {
- this.addthirdParty = true;
- this.thirdPartyLoading = true;
-
- const companiesResponse = await selectCompaniesList();
- this.companiesList = this.HaveJson(companiesResponse.data);
-
- if (this.companiesList.length === 1) {
- const personResponse = await selectSimpleList({ companyId: this.companiesList[0].companyId });
- this.personListCopy = JSON.parse(JSON.stringify(personResponse.data));
- this.personList = personResponse.data;
- this.$refs.personTable.doLayout();
- }
-
- this.datathirdParty = this.tranListToTreeData(this.companiesList, "ROOT");
- console.log(' this.datathirdParty---', this.datathirdParty)
- } catch (error) {
- console.error("Error fetching third party data:", error);
- } finally {
- this.thirdPartyLoading = false;
- }
- },
- tranListToTreeData(list, rootValue) {
- return list.reduce((arr, item) => {
- if (item.parentCompanyId === rootValue) {
- const children = this.tranListToTreeData(list, item.companyId);
- if (children.length) {
- item.children = children;
- }
- arr.push(item);
- }
- return arr;
- }, []);
- },
- searchPerson() {
- let arr = JSON.parse(JSON.stringify(this.personListCopy))
- this.personList = arr.filter(a => {
- if (a.employeeID.includes(this.userSearch2) || a.nickName.includes(this.userSearch2)) {
- return true
- }
- })
- },
- searchFilter2() {
- this.$refs.tree2.filter(this.search2)
- },
- nodeClick2(ob, node, el) {
- this.getNodeParent(node)
- if (ob.companyId !== 'SC21') {
- this.personLoad = true
- selectSimpleList({ companyId: ob.companyId }).then(res => {
- this.personListCopy = JSON.parse(JSON.stringify(res.data))
- this.personList = res.data
- this.personLoad = false
- this.$refs.personTable.doLayout()
- })
- }
- },
- getNodeParent(val) {
- this.currentCompaniesList[val.level - 1] = val.data.companyId
- if (val.parent != null) {
- this.getNodeParent(val.parent)
- }
- },
- nodeOpen0(data, node, el) {
- // this.currentCompaniesList[node.level - nodeOpen01] = data.id
- },
- filterNode2(value, data) {
- if (!value) return true;
- return data['companyName'].indexOf(value) !== -1;
- },
- addUser2() {
- if (this.multipleSelection.length === 0) {
- return this.$message.error('璇烽�夋嫨浜哄憳')
- }
- if (this.currentCompaniesList.length === 0) {
- return this.$message.error('璇烽�夋嫨缁勭粐')
- }
- /* for (let index = this.currentCompaniesList.length-1; index >1; index--) {
- let obj = this.multipleSelection.find(a=>a.companyId==this.currentCompaniesList[index])
- if(!obj){
- this.currentCompaniesList.splice(index,1)
- }
- } */
- let arr = []
- this.currentCompaniesList.forEach(b => {
- let obj = this.companiesList.find(a => a.companyId == b)
- arr.push(obj)
- })
- this.addLoad = true
- addPersonUser({
- company: arr,
- person: this.multipleSelection,
- // roleId: this.componentData.entity.roleId
- }).then(res => {
- this.$message.success('鎿嶄綔鎴愬姛')
- this.multipleSelection = []
- this.$refs.personTable.clearSelection()
- this.addLoad = false
- this.addthirdParty = false
- this.userSearch2 = ''
- this.getList()
- }).catch(e => {
- this.addLoad = false
- })
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
diff --git a/src/views/thirdpartylogin.vue b/src/views/thirdpartylogin.vue
deleted file mode 100644
index 1fe70ea..0000000
--- a/src/views/thirdpartylogin.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
- <div></div>
-</template>
-<script>
-export default {
- data() {
- return {
- };
- },
- created() {
- this.initLogin();
- },
- methods: {
- initLogin() {
- this.$store.dispatch('LoginBySSO', {code: this.$route.query.code}).then(() => {
- this.$router.push({path: '/'});
- });
- }
- }
-};
-</script>
-<style scoped></style>
\ No newline at end of file
--
Gitblit v1.9.3