From 377b3968da25cb307b04ad05916805a6ef325dab Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 30 Jul 2024 13:41:51 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=A2=E6=88=B7?=
=?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/api/client/customermanagement.js | 8 +-
yxt-as-ui/src/router/index.js | 6 +
.../customermanagement/customermanagement.vue | 134 +++++++++++++++++-
.../customermanagement/relation/person.vue | 113 +++++++++++++++
.../customermanagement/relation/vehicle.vue | 5 +-
.../relation/vehicleAdd.vue | 11 +-
6 files changed, 267 insertions(+), 10 deletions(-)
create mode 100644 yxt-as-ui/src/views/client/customermanagement/relation/person.vue
diff --git a/yxt-as-ui/src/api/client/customermanagement.js b/yxt-as-ui/src/api/client/customermanagement.js
index bccfdfcfb1..5991669c97 100644
--- a/yxt-as-ui/src/api/client/customermanagement.js
+++ b/yxt-as-ui/src/api/client/customermanagement.js
@@ -44,7 +44,7 @@ export default {
// 定点企业禁用
disableState: function(data) {
return request({
- url: '/crm/v1/crmcustomerorg/disableState',
+ url: '/crm/v1/crmcustomertemp/disableState',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
@@ -53,7 +53,7 @@ export default {
// 定点企业启用
enable: function(data) {
return request({
- url: '/crm/v1/crmcustomerorg/enable',
+ url: '/crm/v1/crmcustomertemp/enable',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
@@ -103,7 +103,7 @@ export default {
// 对接人列表
personList: function(params) {
return request({
- url: '/as/v1/ascustomerperson/personList',
+ url: '/crm/v1/crmmaintenanceenterpriseperson/personList',
method: 'get',
params: params
})
@@ -111,7 +111,7 @@ export default {
// 删除对接人信息
delPersonBySids: function(data) {
return request({
- url: '/as/v1/ascustomerperson/delBySids',
+ url: '/crm/v1/crmmaintenanceenterpriseperson/delBySids',
method: 'DELETE',
data: data,
headers: { 'Content-Type': 'application/json' }
diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js
index 0492665998..de51a10848 100644
--- a/yxt-as-ui/src/router/index.js
+++ b/yxt-as-ui/src/router/index.js
@@ -431,6 +431,12 @@ export const constantRoutes = [{
name: 'CustomerManagement',
meta: { title: '客户管理', noCache: true }
},
+ {
+ path: '/filing/maintenanceEnterprise',
+ component: () => import('@/views/client/filing/maintenanceEnterprise.vue'),
+ name: 'MaintenanceEnterprise',
+ meta: { title: '定点企业备案', noCache: true }
+ },
{
path: '/customerunit/customerunit',
component: () => import('@/views/client/customerunit/customerunit.vue'),
diff --git a/yxt-as-ui/src/views/client/customermanagement/customermanagement.vue b/yxt-as-ui/src/views/client/customermanagement/customermanagement.vue
index 0b6b4d2748..9b2b421bd0 100644
--- a/yxt-as-ui/src/views/client/customermanagement/customermanagement.vue
+++ b/yxt-as-ui/src/views/client/customermanagement/customermanagement.vue
@@ -58,6 +58,18 @@
+
+
+
+
+ {{ scope.row.isEnable == '1' ? '已启用' : scope.row.isEnable == '0' ? '禁用' : '' }}
+
+
+
+
+ {{ scope.row.personCount }}
+
+
{{ scope.row.vehCount }}
@@ -82,6 +94,10 @@
+
+
+
+
@@ -121,6 +137,8 @@ import customermanagementAdd from './customermanagementAdd'
import customermanagementInfo from './customermanagementInfo'
import vehicle from './relation/vehicle'
import vehicleAdd from './relation/vehicleAdd'
+import maintenanceEnterpriseAdd from '../filing/maintenanceEnterpriseAdd'
+import person from './relation/person'
import { typeValues } from '@/api/Common/dictcommons'
export default {
@@ -132,12 +150,35 @@ export default {
customermanagementAdd,
customermanagementInfo,
vehicle,
- vehicleAdd
+ vehicleAdd,
+ maintenanceEnterpriseAdd,
+ person
},
data() {
return {
btndisabled: false,
btnList: [
+ {
+ type: 'primary',
+ size: 'small',
+ icon: '',
+ btnKey: 'toFiling',
+ btnLabel: '定点企业备案'
+ },
+ {
+ type: 'primary',
+ size: 'small',
+ icon: '',
+ btnKey: 'toForbidden',
+ btnLabel: '禁用'
+ },
+ {
+ type: 'primary',
+ size: 'small',
+ icon: '',
+ btnKey: 'toEnable',
+ btnLabel: '启用'
+ },
{
type: 'primary',
size: 'small',
@@ -187,6 +228,7 @@ export default {
tableKey: 0,
list: [],
sids: [], // 用于导出的时候保存已选择的SIDs
+ multipleSelection: [],
merType: [],
induslevel: [],
visitWay_list: [],
@@ -263,6 +305,15 @@ export default {
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
+ case 'toFiling':
+ this.toFiling()
+ break
+ case 'toForbidden':
+ this.toForbidden()
+ break
+ case 'toEnable':
+ this.toEnable()
+ break
case 'toAdd':
this.toAdd()
break
@@ -288,6 +339,7 @@ export default {
// 信息条数 获取点击时当前的sid
handleSelectionChange(row) {
const aa = []
+ this.multipleSelection = row
row.forEach(element => {
aa.push(element.sid)
})
@@ -341,6 +393,78 @@ export default {
}
this.getList()
},
+ toFiling() {
+ if (this.sids.length === 1) {
+ for (var i = 0; i < this.multipleSelection.length; i++) {
+ if (this.multipleSelection[i].isDesignatedEnterprise === '1' || !this.multipleSelection[i].isFilingIndate) {
+ this.$message({ showClose: true, type: 'error', message: '因该条记录中是否为定点企业为是且备案有效期仍在有效期内,需要进行补充备案操作' })
+ return
+ }
+ }
+ this.viewState = 7
+ this.$refs['divAddFiling'].dataInit(this.sids[0])
+ } else {
+ this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
+ }
+ },
+ toForbidden() {
+ if (this.sids.length === 0) {
+ this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行操作' })
+ return
+ }
+ const tip = '请确认是否禁用所选 ' + this.sids.length + ' 条记录?'
+ this.$confirm(tip, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ const loading = this.$loading({
+ lock: true,
+ text: 'Loading',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ req.disableState(this.sids).then(resp => {
+ if (resp.success) {
+ this.$message({ type: 'success', message: resp.msg, showClose: true })
+ }
+ this.getList()
+ loading.close()
+ }).catch(e => {
+ loading.close()
+ })
+ }).catch(() => {
+ })
+ },
+ toEnable() {
+ if (this.sids.length === 0) {
+ this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行操作' })
+ return
+ }
+ const tip = '请确认是否启用所选 ' + this.sids.length + ' 条记录?'
+ this.$confirm(tip, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ const loading = this.$loading({
+ lock: true,
+ text: 'Loading',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ req.enable(this.sids).then(resp => {
+ if (resp.success) {
+ this.$message({ type: 'success', message: resp.msg, showClose: true })
+ }
+ this.getList()
+ loading.close()
+ }).catch(e => {
+ loading.close()
+ })
+ }).catch(() => {
+ })
+ },
toAdd() {
this.dialogVisible = true
this.formobj = {
@@ -387,6 +511,10 @@ export default {
},
addVehicle() {
if (this.sids.length === 1) {
+ if (this.multipleSelection[0].isDesignatedEnterprise === '1' || !this.multipleSelection[0].isFilingIndate) {
+ this.$message({ showClose: true, type: 'error', message: '因该条记录中是否为定点企业为是且备案有效期仍在有效期内,需要进行补充备案操作' })
+ return
+ }
this.viewState = 6
this.$refs['divAddVehicle'].showAdd(this.sids[0])
} else {
@@ -397,6 +525,10 @@ export default {
this.viewState = 5
this.$refs['divVehicle'].showInfo(row)
},
+ lookPerson(row) {
+ this.viewState = 8
+ this.$refs['divPerson'].showInfo(row)
+ },
doExport() {},
// 删除
doDel() {
diff --git a/yxt-as-ui/src/views/client/customermanagement/relation/person.vue b/yxt-as-ui/src/views/client/customermanagement/relation/person.vue
new file mode 100644
index 0000000000..0741441d7d
--- /dev/null
+++ b/yxt-as-ui/src/views/client/customermanagement/relation/person.vue
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+ 车辆列表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yxt-as-ui/src/views/client/customermanagement/relation/vehicle.vue b/yxt-as-ui/src/views/client/customermanagement/relation/vehicle.vue
index 2439489b25..0ab13aceae 100644
--- a/yxt-as-ui/src/views/client/customermanagement/relation/vehicle.vue
+++ b/yxt-as-ui/src/views/client/customermanagement/relation/vehicle.vue
@@ -49,6 +49,7 @@ export default {
},
data() {
return {
+ isDesignatedEnterprise: false,
viewTitle: '',
viewState: 1,
submitdisabled: false,
@@ -68,6 +69,7 @@ export default {
this.$refs['form_obj'].clearValidate()
})
this.formobj.sid = row.sid
+ this.isDesignatedEnterprise = row.isDesignatedEnterprise
req.vehList({ sid: row.sid }).then((res) => {
if (res.success) {
this.formobj.list = res.data
@@ -85,7 +87,7 @@ export default {
handleEdit() {
if (this.sids.length === 1) {
this.viewState = 2
- this.$refs['divAdd'].showEdit(this.sids[0])
+ this.$refs['divAdd'].showEdit(this.sids[0], this.isDesignatedEnterprise)
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
}
@@ -138,6 +140,7 @@ export default {
sid: '',
list: []
}
+ this.isDesignatedEnterprise = false
this.submitdisabled = false
this.$emit('doback')
}
diff --git a/yxt-as-ui/src/views/client/customermanagement/relation/vehicleAdd.vue b/yxt-as-ui/src/views/client/customermanagement/relation/vehicleAdd.vue
index 45fa178e77..0f24287545 100644
--- a/yxt-as-ui/src/views/client/customermanagement/relation/vehicleAdd.vue
+++ b/yxt-as-ui/src/views/client/customermanagement/relation/vehicleAdd.vue
@@ -14,17 +14,17 @@
*车牌号
-
+
*车架号
-
+
发动机号
-
+
车型
@@ -160,6 +160,7 @@ export default {
viewTitle: '',
viewState: 1,
submitdisabled: false,
+ isDesignatedEnterprise: false, // 是否为定点企业为是时,编辑车辆信息时车牌号、车架号、发动机号不允许修改
formobj: {
customerVehSid: '',
customerSid: '',
@@ -205,11 +206,12 @@ export default {
})
this.formobj.customerSid = sid
},
- showEdit(sid) {
+ showEdit(sid, isDesignatedEnterprise) {
this.viewTitle = '【编辑】车辆'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
+ this.isDesignatedEnterprise = isDesignatedEnterprise
req.details(sid).then((res) => {
if (res.success) {
this.formobj = res.data
@@ -285,6 +287,7 @@ export default {
carRemarks: '',
byRemarks: ''
}
+ this.isDesignatedEnterprise = false
this.submitdisabled = false
this.$emit('doback')
},
From ccd6d65d3f1aff92d5041aed83b1b726b4221d3c Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 30 Jul 2024 13:42:53 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=9A=E7=82=B9?=
=?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=A4=87=E6=A1=88=E7=BB=B4=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/api/client/maintenanceEnterprise.js | 114 +++++
.../client/filing/maintenanceEnterprise.vue | 403 ++++++++++++++++++
.../filing/maintenanceEnterpriseAdd.vue | 395 +++++++++++++++++
.../filing/maintenanceEnterpriseInfo.vue | 231 ++++++++++
4 files changed, 1143 insertions(+)
create mode 100644 yxt-as-ui/src/api/client/maintenanceEnterprise.js
create mode 100644 yxt-as-ui/src/views/client/filing/maintenanceEnterprise.vue
create mode 100644 yxt-as-ui/src/views/client/filing/maintenanceEnterpriseAdd.vue
create mode 100644 yxt-as-ui/src/views/client/filing/maintenanceEnterpriseInfo.vue
diff --git a/yxt-as-ui/src/api/client/maintenanceEnterprise.js b/yxt-as-ui/src/api/client/maintenanceEnterprise.js
new file mode 100644
index 0000000000..55d042d909
--- /dev/null
+++ b/yxt-as-ui/src/api/client/maintenanceEnterprise.js
@@ -0,0 +1,114 @@
+import request from '@/utils/request'
+
+export default {
+ // 查询分页列表
+ listPage: function(params) {
+ return request({
+ url: '/crm/v1/maintenanceEnterprise/listPage',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 初始化
+ init(data) {
+ return request({
+ url: '/crm/v1/maintenanceEnterprise/init',
+ method: 'get',
+ params: data
+ })
+ },
+ // 编辑回显
+ fetchDetailsBySid: function(data) {
+ return request({
+ url: '/crm/v1/maintenanceEnterprise/fetchDetailsBySid/' + data,
+ method: 'get'
+ })
+ },
+ saveOrUpdate: function(data) {
+ return request({
+ url: '/crm/v1/maintenanceEnterprise/save',
+ method: 'post',
+ data: data,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ deleteBySids: function(data) {
+ return request({
+ url: '/crm/v1/maintenanceEnterprise/delBySids',
+ method: 'DELETE',
+ data: data,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 提交流程
+ submit: function(params) {
+ return request({
+ url: '/crm/v1/maintenanceEnterprise/submit',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 流程审批(同意)
+ complete: function(params) {
+ return request({
+ url: '/crm/v1/maintenanceEnterprise/complete',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 流程审批(加签)
+ delegate: function(params) {
+ return request({
+ url: '/crm/v1/maintenanceEnterprise/delegate',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 流程审批(驳回)
+ reject: function(params) {
+ return request({
+ url: '/crm/v1/maintenanceEnterprise/reject',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 流程审批(终止)
+ breakProcess: function(params) {
+ return request({
+ url: '/crm/v1/maintenanceEnterprise/breakProcess',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 流程审批(撤回)
+ revokeProcess: function(params) {
+ return request({
+ url: '/crm/v1/maintenanceEnterprise/revokeProcess',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 审批流程(同意)获取下一环节
+ getNextNodesForSubmit: function(data) {
+ return request({
+ url: '/crm/v1/maintenanceEnterprise/getNextNodesForSubmit',
+ method: 'get',
+ params: data
+ })
+ },
+ // 审批流程(驳回)获取上一环节
+ getPreviousNodesForReject: function(data) {
+ return request({
+ url: '/crm/v1/maintenanceEnterprise/getPreviousNodesForReject',
+ method: 'get',
+ params: data
+ })
+ }
+}
diff --git a/yxt-as-ui/src/views/client/filing/maintenanceEnterprise.vue b/yxt-as-ui/src/views/client/filing/maintenanceEnterprise.vue
new file mode 100644
index 0000000000..db47f08e3e
--- /dev/null
+++ b/yxt-as-ui/src/views/client/filing/maintenanceEnterprise.vue
@@ -0,0 +1,403 @@
+
+
+
+
+
+
+
+
+
{{ searchxianshitit }}
+
+
+
+
+
+
+
+
+
+
+
+ 办理
+ 查看
+
+
+
+
+ 待提交
+ {{ scope.row.nodeState }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yxt-as-ui/src/views/client/filing/maintenanceEnterpriseAdd.vue b/yxt-as-ui/src/views/client/filing/maintenanceEnterpriseAdd.vue
new file mode 100644
index 0000000000..24c8c15f65
--- /dev/null
+++ b/yxt-as-ui/src/views/client/filing/maintenanceEnterpriseAdd.vue
@@ -0,0 +1,395 @@
+
+
+
+
+
+
+ 基础信息
+
+
+ 客户名称
+ {{ formobj.customerName }}
+
+
+ 客户类型
+ {{ formobj.customerType }}
+
+
+
+
+ 联系电话
+ {{ formobj.mobile }}
+
+
+ 微信号
+ {{ formobj.weixin }}
+
+
+
+
+ 客户地址
+ {{ formobj.province }}{{ formobj.city }}{{ formobj.county }}{{ formobj.address }}
+
+
+
+
+ 证件类型
+ {{ formobj.certificateType }}
+
+
+ 证件号码
+ {{ formobj.idnumber }}
+
+
+
+
+ 证件有效期
+ {{ formobj.endDate }}
+
+
+ 电子邮箱
+ {{ formobj.e_mail }}
+
+
+
+
+ 紧急联系人
+ {{ formobj.emergencyContact }}
+
+
+ 紧急联系电话
+ {{ formobj.emergencyMobile }}
+
+
+
+
+ 备案有效期
+
+
+
+ 备注
+
+
+
+
+
+ 附件
+
+
+
+
+
+ 对接人信息(已备{{ formobj.readyStrength }}人)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 车辆信息(已备{{ formobj.readyVehicle }}辆)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yxt-as-ui/src/views/client/filing/maintenanceEnterpriseInfo.vue b/yxt-as-ui/src/views/client/filing/maintenanceEnterpriseInfo.vue
new file mode 100644
index 0000000000..42b165d6cb
--- /dev/null
+++ b/yxt-as-ui/src/views/client/filing/maintenanceEnterpriseInfo.vue
@@ -0,0 +1,231 @@
+
+
+
+
+
+
+ 基础信息
+
+
+ 客户名称
+ {{ formobj.customerName }}
+
+
+ 客户类型
+ {{ formobj.customerType }}
+
+
+
+
+ 联系电话
+ {{ formobj.mobile }}
+
+
+ 微信号
+ {{ formobj.weixin }}
+
+
+
+
+ 客户地址
+ {{ formobj.province }}{{ formobj.city }}{{ formobj.county }}{{ formobj.address }}
+
+
+
+
+ 证件类型
+ {{ formobj.certificateType }}
+
+
+ 证件号码
+ {{ formobj.idnumber }}
+
+
+
+
+ 证件有效期
+ {{ formobj.endDate }}
+
+
+ 电子邮箱
+ {{ formobj.e_mail }}
+
+
+
+
+ 紧急联系人
+ {{ formobj.emergencyContact }}
+
+
+ 紧急联系电话
+ {{ formobj.emergencyMobile }}
+
+
+
+
+ 备案有效期
+ {{ formobj.filingIndate }}
+
+
+ 备注
+ {{ formobj.remarks }}
+
+
+
+
+ 附件
+
+
+
+ 对接人信息(已备{{ formobj.readyStrength }}人)
+
+
+
+
+
+
+ 车辆信息(已备{{ formobj.readyVehicle }}辆)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 6b40d9bac51016eaf3903ecbcab537e0e79632d4 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 30 Jul 2024 13:59:28 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?=
=?UTF-8?q?=E6=8A=80=E5=B8=88=E8=81=8C=E7=A7=B0=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/basicinformation/technicalTitle.js | 36 ++
yxt-as-ui/src/router/index.js | 6 +
.../technicalTitle/technicalTitle.vue | 397 ++++++++++++++++++
3 files changed, 439 insertions(+)
create mode 100644 yxt-as-ui/src/api/basicinformation/technicalTitle.js
create mode 100644 yxt-as-ui/src/views/basicinformation/technicalTitle/technicalTitle.vue
diff --git a/yxt-as-ui/src/api/basicinformation/technicalTitle.js b/yxt-as-ui/src/api/basicinformation/technicalTitle.js
new file mode 100644
index 0000000000..260f1db2cf
--- /dev/null
+++ b/yxt-as-ui/src/api/basicinformation/technicalTitle.js
@@ -0,0 +1,36 @@
+import request from '@/utils/request'
+
+export default {
+ // 查询分页列表
+ listPage: function(params) {
+ return request({
+ url: '/as/v1/astechtitle/listPage',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ fetchBySid: function(data) {
+ return request({
+ url: '/as/v1/astechtitle/fetchDetailsBySid/' + data,
+ method: 'get'
+ })
+ },
+ saveOrUpdate: function(data) {
+ return request({
+ url: '/as/v1/astechtitle/save',
+ method: 'post',
+ data: data,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ deleteBySids: function(data) {
+ return request({
+ url: '/as/v1/astechtitle/delBySids',
+ method: 'DELETE',
+ data: data,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ }
+}
+
diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js
index de51a10848..200b305a0c 100644
--- a/yxt-as-ui/src/router/index.js
+++ b/yxt-as-ui/src/router/index.js
@@ -586,6 +586,12 @@ export const constantRoutes = [{
component: () => import('@/views/basicinformation/claimantManufacturer/claimantManufacturer.vue'),
name: 'ClaimantManufacturer',
meta: { title: '索赔厂家管理', noCache: true }
+ },
+ {
+ path: '/technicalTitle/technicalTitle',
+ component: () => import('@/views/basicinformation/technicalTitle/technicalTitle.vue'),
+ name: 'TechnicalTitle',
+ meta: { title: '维修技师职称管理', noCache: true }
}
]
},
diff --git a/yxt-as-ui/src/views/basicinformation/technicalTitle/technicalTitle.vue b/yxt-as-ui/src/views/basicinformation/technicalTitle/technicalTitle.vue
new file mode 100644
index 0000000000..26249820c6
--- /dev/null
+++ b/yxt-as-ui/src/views/basicinformation/technicalTitle/technicalTitle.vue
@@ -0,0 +1,397 @@
+
+
+
+
+
+
+
+
+
{{ searchxianshitit }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ *职称名称
+
+
+
+
+
+
+
+
+
+ *权重
+
+
+
+
+
+ 备注
+
+
+
+
+
+ *排序
+
+
+
+
+
+
+
+
+
+
+
From 2aabb4bc1b681121f829b5be8238d9689c7c0094 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 31 Jul 2024 09:43:53 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=92=E6=89=A3?=
=?UTF-8?q?=E7=94=B3=E8=AF=B7--=E7=BC=96=E8=BE=91=E3=80=81=E8=AF=A6?=
=?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E4=B8=AD=E5=BD=93=E6=9C=88=E8=BF=98?=
=?UTF-8?q?=E6=AC=BE=E8=AE=B0=E5=BD=95=E8=A1=A8=E5=88=A0=E9=99=A4=E8=BF=98?=
=?UTF-8?q?=E6=AC=BE=E7=8A=B6=E6=80=81=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
anrui-riskcenter-ui/src/views/deduct/deductAdd.vue | 10 +++++-----
anrui-riskcenter-ui/src/views/deduct/deductInfo.vue | 10 +++++-----
.../src/views/workFlow/huakouFlow/deductDaiBan.vue | 10 +++++-----
.../src/views/workFlow/huakouFlow/deductEdit.vue | 10 +++++-----
.../src/views/workFlow/huakouFlow/deductYiBan.vue | 10 +++++-----
5 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/anrui-riskcenter-ui/src/views/deduct/deductAdd.vue b/anrui-riskcenter-ui/src/views/deduct/deductAdd.vue
index 683c83db53..09f1e64c03 100644
--- a/anrui-riskcenter-ui/src/views/deduct/deductAdd.vue
+++ b/anrui-riskcenter-ui/src/views/deduct/deductAdd.vue
@@ -57,11 +57,11 @@
-
-
- {{ scope.row.payState == '0' ? '正常还款' : '逾期还款'}}
-
-
+
+
+
+
+
diff --git a/anrui-riskcenter-ui/src/views/deduct/deductInfo.vue b/anrui-riskcenter-ui/src/views/deduct/deductInfo.vue
index 6d7393c1b0..f96d5d21ec 100644
--- a/anrui-riskcenter-ui/src/views/deduct/deductInfo.vue
+++ b/anrui-riskcenter-ui/src/views/deduct/deductInfo.vue
@@ -56,11 +56,11 @@
-
-
- {{ scope.row.payState == '0' ? '正常还款' : '逾期还款'}}
-
-
+
+
+
+
+
diff --git a/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductDaiBan.vue
index 1058d9c99d..5737b36a87 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductDaiBan.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductDaiBan.vue
@@ -58,11 +58,11 @@
-
-
- {{ scope.row.payState == '0' ? '正常还款' : '逾期还款'}}
-
-
+
+
+
+
+
diff --git a/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductEdit.vue
index 13ce6fa938..cf24439eb8 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductEdit.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductEdit.vue
@@ -56,11 +56,11 @@
-
-
- {{ scope.row.payState == '0' ? '正常还款' : '逾期还款'}}
-
-
+
+
+
+
+
diff --git a/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductYiBan.vue
index 762cbab5d2..1129360c1c 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductYiBan.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductYiBan.vue
@@ -56,11 +56,11 @@
-
-
- {{ scope.row.payState == '0' ? '正常还款' : '逾期还款'}}
-
-
+
+
+
+
+
From 9a2a3aef0a666eb495330fe447ea4b2b75156262 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 31 Jul 2024 09:49:42 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=9F=E6=88=90?=
=?UTF-8?q?=E8=BF=98=E6=AC=BE=E8=AE=A1=E5=88=92=E8=A1=A8--=E7=82=B9?=
=?UTF-8?q?=E5=87=BB=E7=94=9F=E6=88=90=E6=97=B6=E5=A2=9E=E5=8A=A0=E4=BA=8C?=
=?UTF-8?q?=E6=AC=A1=E7=A1=AE=E8=AE=A4=E5=BC=B9=E6=A1=86=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../repaymentscheduleAdd.vue | 37 +++++++++++--------
1 file changed, 22 insertions(+), 15 deletions(-)
diff --git a/anrui-riskcenter-ui/src/views/repaymentschedule/repaymentscheduleAdd.vue b/anrui-riskcenter-ui/src/views/repaymentschedule/repaymentscheduleAdd.vue
index 28a356bf28..26bbf414aa 100644
--- a/anrui-riskcenter-ui/src/views/repaymentschedule/repaymentscheduleAdd.vue
+++ b/anrui-riskcenter-ui/src/views/repaymentschedule/repaymentscheduleAdd.vue
@@ -365,22 +365,29 @@ export default {
}
},
saveOrUpdate() {
- this.$refs['form_obj'].validate((valid) => {
- if (valid) {
- this.submitdisabled = true
- this.formobj.userSid = window.sessionStorage.getItem('userSid')
- req.loanCreateSchedulePdf(this.formobj).then((res) => {
- if (res.success) {
- this.$message({ showClose: true, type: 'success', message: '生成成功' })
- this.handleReturn('true')
- }
- else {
+ const tip = '请再次确认填写信息是否正确,确定后数据会传送到财务系统中。'
+ this.$confirm(tip, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ this.$refs['form_obj'].validate((valid) => {
+ if (valid) {
+ this.submitdisabled = true
+ this.formobj.userSid = window.sessionStorage.getItem('userSid')
+ req.loanCreateSchedulePdf(this.formobj).then((res) => {
+ if (res.success) {
+ this.$message({ showClose: true, type: 'success', message: '生成成功' })
+ this.handleReturn('true')
+ }
+ else {
+ this.submitdisabled = false
+ }
+ }).catch(() => {
this.submitdisabled = false
- }
- }).catch(() => {
- this.submitdisabled = false
- })
- }
+ })
+ }
+ })
})
},
lookJR() {
From b51284fbe92bbadd185f47453693394133963aa9 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 31 Jul 2024 10:14:09 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?=
=?UTF-8?q?=E6=8A=80=E5=B8=88=E8=81=8C=E7=A7=B0=E5=A4=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yxt-as-ui/src/api/Common/dictcommons.js | 18 +-
.../basicinformation/technicalTitleFiling.js | 115 ++++++
yxt-as-ui/src/router/index.js | 27 ++
.../technicalTitle/technicalTitle.vue | 25 +-
.../technicalTitleFiling.vue | 326 +++++++++++++++
.../technicalTitleFilingAdd.vue | 261 ++++++++++++
.../technicalTitleFilingInfo.vue | 143 +++++++
.../technicalTitleFilingDaiBan.vue | 374 ++++++++++++++++++
.../technicalTitleFilingEdit.vue | 227 +++++++++++
.../technicalTitleFilingYiBan.vue | 192 +++++++++
10 files changed, 1698 insertions(+), 10 deletions(-)
create mode 100644 yxt-as-ui/src/api/basicinformation/technicalTitleFiling.js
create mode 100644 yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFiling.vue
create mode 100644 yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingAdd.vue
create mode 100644 yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingInfo.vue
create mode 100644 yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingDaiBan.vue
create mode 100644 yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingEdit.vue
create mode 100644 yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingYiBan.vue
diff --git a/yxt-as-ui/src/api/Common/dictcommons.js b/yxt-as-ui/src/api/Common/dictcommons.js
index 6615db3fdd..7ee224fe5e 100644
--- a/yxt-as-ui/src/api/Common/dictcommons.js
+++ b/yxt-as-ui/src/api/Common/dictcommons.js
@@ -26,15 +26,6 @@ export function selectOrgSidList(data) {
})
}
-// 获取分公司
-export function getListOrg(data) {
- return request({
- url: '/portal/v1/sysorganization/getListOrg',
- method: 'get',
- params: data
- })
-}
-
// 根据当前登录人orgSidPath(全路径sid)查询分公司
export function getOrgSidByPath(data) {
return request({
@@ -79,6 +70,15 @@ export function selFianceByOrgSidPath(data) {
})
}
+// 根据当前登录用户部门sid获取本部门下角色为维修技师的人员
+export function getUserByDeptSid(data) {
+ return request({
+ url: '/portal/v1/sysuser/getUserByDeptSid',
+ method: 'get',
+ params: data
+ })
+}
+
// 当前用户创建申请时判断该用户是否有该菜单的操作权限
export function selectHaveMessage(data) {
return request({
diff --git a/yxt-as-ui/src/api/basicinformation/technicalTitleFiling.js b/yxt-as-ui/src/api/basicinformation/technicalTitleFiling.js
new file mode 100644
index 0000000000..b7952f53d0
--- /dev/null
+++ b/yxt-as-ui/src/api/basicinformation/technicalTitleFiling.js
@@ -0,0 +1,115 @@
+import request from '@/utils/request'
+
+export default {
+ // 查询分页列表
+ listPage: function(params) {
+ return request({
+ url: '/as/v1/astechtitleapply/listPage',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 初始化
+ init: function(data) {
+ return request({
+ url: '/as/v1/astechtitleapply/init',
+ method: 'post',
+ data: data,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 回显
+ fetchDetailsBySid: function(data) {
+ return request({
+ url: '/as/v1/astechtitleapply/fetchDetailsBySid/' + data,
+ method: 'get'
+ })
+ },
+ saveOrUpdate: function(data) {
+ return request({
+ url: '/as/v1/astechtitleapply/save',
+ method: 'post',
+ data: data,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ deleteBySids: function(data) {
+ return request({
+ url: '/as/v1/astechtitleapply/delBySids',
+ method: 'DELETE',
+ data: data,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 提交流程
+ submit: function(params) {
+ return request({
+ url: '/as/v1/astechtitleapply/submitApply',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 流程审批(同意)
+ complete: function(params) {
+ return request({
+ url: '/as/v1/astechtitleapply/complete',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 流程审批(加签)
+ delegate: function(params) {
+ return request({
+ url: '/as/v1/astechtitleapply/delegate',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 流程审批(驳回)
+ reject: function(params) {
+ return request({
+ url: '/as/v1/astechtitleapply/reject',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 流程审批(终止)
+ breakProcess: function(params) {
+ return request({
+ url: '/as/v1/astechtitleapply/breakProcess',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 流程审批(撤回)
+ revokeProcess: function(params) {
+ return request({
+ url: '/as/v1/astechtitleapply/revokeProcess',
+ method: 'post',
+ data: params,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ },
+ // 审批流程(同意)获取下一环节
+ getNextNodesForSubmit: function(data) {
+ return request({
+ url: '/as/v1/astechtitleapply/getNextNodesForSubmit',
+ method: 'get',
+ params: data
+ })
+ },
+ // 审批流程(驳回)获取上一环节
+ getPreviousNodesForReject: function(data) {
+ return request({
+ url: '/as/v1/astechtitleapply/getPreviousNodesForReject',
+ method: 'get',
+ params: data
+ })
+ }
+}
diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js
index 200b305a0c..f4bca1f898 100644
--- a/yxt-as-ui/src/router/index.js
+++ b/yxt-as-ui/src/router/index.js
@@ -592,6 +592,12 @@ export const constantRoutes = [{
component: () => import('@/views/basicinformation/technicalTitle/technicalTitle.vue'),
name: 'TechnicalTitle',
meta: { title: '维修技师职称管理', noCache: true }
+ },
+ {
+ path: '/technicalTitleFiling/technicalTitleFiling',
+ component: () => import('@/views/basicinformation/technicalTitleFiling/technicalTitleFiling.vue'),
+ name: 'TechnicalTitleFiling',
+ meta: { title: '维修技师职称备案管理', noCache: true }
}
]
},
@@ -849,6 +855,27 @@ export const constantRoutes = [{
import('@/views/workFlow/weixiubeianFlow/maintenanceProjectRecordYiBan.vue'),
name: 'MaintenanceProjectRecordYiBan'
},
+ // 维修技师职称备案 -- 编辑
+ {
+ path: '/jishizhichengFlow/technicalTitleFilingEdit',
+ component: () =>
+ import('@/views/workFlow/jishizhichengFlow/technicalTitleFilingEdit.vue'),
+ name: 'TechnicalTitleFilingEdit'
+ },
+ // 维修技师职称备案 -- 待办
+ {
+ path: '/jishizhichengFlow/technicalTitleFilingDaiBan',
+ component: () =>
+ import('@/views/workFlow/jishizhichengFlow/technicalTitleFilingDaiBan.vue'),
+ name: 'TechnicalTitleFilingDaiBan'
+ },
+ // 维修技师职称备案 -- 已办
+ {
+ path: '/jishizhichengFlow/technicalTitleFilingYiBan',
+ component: () =>
+ import('@/views/workFlow/jishizhichengFlow/technicalTitleFilingYiBan.vue'),
+ name: 'TechnicalTitleFilingYiBan'
+ },
// 404 page must be placed at the end !!!
// { path: '*', redirect: '/404', hidden: true }
]
diff --git a/yxt-as-ui/src/views/basicinformation/technicalTitle/technicalTitle.vue b/yxt-as-ui/src/views/basicinformation/technicalTitle/technicalTitle.vue
index 26249820c6..a2ac5cafb1 100644
--- a/yxt-as-ui/src/views/basicinformation/technicalTitle/technicalTitle.vue
+++ b/yxt-as-ui/src/views/basicinformation/technicalTitle/technicalTitle.vue
@@ -84,6 +84,8 @@
取消
+
+
@@ -93,13 +95,15 @@ import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/basicinformation/technicalTitle'
import { typeValues } from '@/api/Common/dictcommons'
+import technicalTitleFilingAdd from '../technicalTitleFiling/technicalTitleFilingAdd'
export default {
name: 'TechnicalTitle',
components: {
Pagination,
pageye,
- ButtonBar
+ ButtonBar,
+ technicalTitleFilingAdd
},
data() {
return {
@@ -138,6 +142,13 @@ export default {
btnKey: 'toEdit',
btnLabel: '编辑'
},
+ {
+ type: 'primary',
+ size: 'small',
+ icon: '',
+ btnKey: 'toFiling',
+ btnLabel: '备案'
+ },
{
type: 'danger',
size: 'small',
@@ -208,6 +219,9 @@ export default {
case 'toEdit':
this.toEdit()
break
+ case 'toFiling':
+ this.toFiling()
+ break
case 'doDel':
this.doDel()
break
@@ -343,6 +357,15 @@ export default {
createOrgName: ''
}
},
+ toFiling() {
+ if (this.sids.length > 0) {
+ this.viewState = 2
+ this.$refs['divAdd'].showAdd(this.sids)
+ } else {
+ this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
+ return
+ }
+ },
// 删除
doDel() {
if (this.sids.length === 0) {
diff --git a/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFiling.vue b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFiling.vue
new file mode 100644
index 0000000000..83334b8849
--- /dev/null
+++ b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFiling.vue
@@ -0,0 +1,326 @@
+
+
+
+
+
+
+
+
+
{{ searchxianshitit }}
+
+
+
+
+
+
+
+
+
+
+
+ 办理
+ 查看
+
+
+
+
+ 待提交
+ {{ scope.row.nodeState }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingAdd.vue b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingAdd.vue
new file mode 100644
index 0000000000..1b8459cab8
--- /dev/null
+++ b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingAdd.vue
@@ -0,0 +1,261 @@
+
+
+
+
+
+
+
+
+ 申请部门
+ {{ formobj.deptName }}
+
+
+ 申请人
+ {{ formobj.createByName }}
+
+
+ 申请日期
+ {{ formobj.createTime }}
+
+
+
+
+ 备注
+
+
+
+
+
+ 附件
+
+
+
+
+
+ 维修技师职称备案列表
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingInfo.vue b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingInfo.vue
new file mode 100644
index 0000000000..a36b7a3279
--- /dev/null
+++ b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingInfo.vue
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
+
+ 申请部门
+ {{ formobj.deptName }}
+
+
+ 申请人
+ {{ formobj.createByName }}
+
+
+ 申请日期
+ {{ formobj.createTime }}
+
+
+
+
+ 备注
+ {{ formobj.remarks }}
+
+
+
+
+ 附件
+
+
+
+ 维修技师职称备案列表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingDaiBan.vue b/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingDaiBan.vue
new file mode 100644
index 0000000000..85e8f07722
--- /dev/null
+++ b/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingDaiBan.vue
@@ -0,0 +1,374 @@
+
+
+
+
+
+
+
+
+ 申请部门
+ {{ formobj.deptName }}
+
+
+ 申请人
+ {{ formobj.createByName }}
+
+
+ 申请日期
+ {{ formobj.createTime }}
+
+
+
+
+ 备注
+ {{ formobj.remarks }}
+
+
+
+
+ 附件
+
+
+
+ 维修技师职称备案列表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ *加签人员:
+
+
+
+
+
+
+
+
+
+
+
+
+ 当前环节:
+
+
+ {{ current.taskName }}->{{ nextNode.name }}
+
+
+
+
+ 意见:
+
+
+
+
+
+
+ 确 定
+ 取 消
+
+
+
+
+
+
+
+
+
diff --git a/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingEdit.vue b/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingEdit.vue
new file mode 100644
index 0000000000..14664c287c
--- /dev/null
+++ b/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingEdit.vue
@@ -0,0 +1,227 @@
+
+
+
+
+
+
+
+
+ 申请部门
+ {{ formobj.deptName }}
+
+
+ 申请人
+ {{ formobj.createByName }}
+
+
+ 申请日期
+ {{ formobj.createTime }}
+
+
+
+
+ 备注
+
+
+
+
+
+ 附件
+
+
+
+
+
+ 维修技师职称备案列表
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingYiBan.vue b/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingYiBan.vue
new file mode 100644
index 0000000000..22c026f450
--- /dev/null
+++ b/yxt-as-ui/src/views/workFlow/jishizhichengFlow/technicalTitleFilingYiBan.vue
@@ -0,0 +1,192 @@
+
+
+
+
+
+
+
+
+ 申请部门
+ {{ formobj.deptName }}
+
+
+ 申请人
+ {{ formobj.createByName }}
+
+
+ 申请日期
+ {{ formobj.createTime }}
+
+
+
+
+ 备注
+ {{ formobj.remarks }}
+
+
+
+
+ 附件
+
+
+
+ 维修技师职称备案列表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 5bbe44ca241df77c03ac8c38db339816f999e358 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 31 Jul 2024 10:43:57 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86--=E6=8B=BC=E9=9F=B3?=
=?UTF-8?q?=E7=BC=A9=E5=86=99=E6=94=B9=E4=B8=BA=E9=A1=B9=E7=9B=AE=E7=BC=96?=
=?UTF-8?q?=E7=A0=81=E3=80=81=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A=E5=86=85?=
=?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
anrui-riskcenter-ui/.env.development | 2 +-
.../basicinformation/maintenanceitem/maintenanceitem.vue | 2 +-
.../maintenanceitem/maintenanceitemAdd.vue | 7 ++++++-
.../maintenanceitem/maintenanceitemInfo.vue | 7 ++++++-
4 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/anrui-riskcenter-ui/.env.development b/anrui-riskcenter-ui/.env.development
index 284a65afb4..cbbbedcf2b 100644
--- a/anrui-riskcenter-ui/.env.development
+++ b/anrui-riskcenter-ui/.env.development
@@ -6,5 +6,5 @@ VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址
##VUE_APP_URL = "http://26077a35f5.wicp.vip"
-VUE_APP_URL = "http://anrui.yyundong.com"
+VUE_APP_URL = "http://120.46.172.184:8111"
diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue
index 5fbab88084..244bcf809d 100644
--- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue
+++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue
@@ -61,7 +61,7 @@
{{ scope.row.isEnable == '0' ? '禁用' : scope.row.isEnable == '1' ? '启用' : '' }}
-
+
diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
index 01b7fe942b..62590d8ddf 100644
--- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
+++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
@@ -16,7 +16,7 @@
- 拼音缩写
+ 项目编码
{{ formobj.sitemCode }}
@@ -111,6 +111,11 @@
+
+
+ 注:维修项目涉及的价格填写时均应为不含税价格。
+
+
diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue
index 466366049a..5b78611fd6 100644
--- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue
+++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue
@@ -15,7 +15,7 @@
{{ formobj.sitemName }}
- 拼音缩写
+ 项目编码
{{ formobj.sitemCode }}
@@ -79,6 +79,11 @@
{{ formobj.sortNo }}
+
+
+ 注:维修项目涉及的价格填写时均应为不含税价格。
+
+
From e4a42a953a7b8e70d46a1c092bbf975546c81fcd Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 31 Jul 2024 10:50:15 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/basicinformation/maintenanceitem/maintenanceitem.vue | 3 +--
.../basicinformation/maintenanceitem/maintenanceitemAdd.vue | 2 +-
.../basicinformation/maintenanceitem/maintenanceitemInfo.vue | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue
index 244bcf809d..2870b8d280 100644
--- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue
+++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue
@@ -61,9 +61,8 @@
{{ scope.row.isEnable == '0' ? '禁用' : scope.row.isEnable == '1' ? '启用' : '' }}
-
-
+
diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
index 62590d8ddf..f72ca4f618 100644
--- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
+++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
@@ -113,7 +113,7 @@
- 注:维修项目涉及的价格填写时均应为不含税价格。
+ 注:维修项目涉及的价格填写时均应为不含税价格。
diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue
index 5b78611fd6..a8d3906690 100644
--- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue
+++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue
@@ -81,7 +81,7 @@
- 注:维修项目涉及的价格填写时均应为不含税价格。
+ 注:维修项目涉及的价格填写时均应为不含税价格。
From eb68b5fd5e74f1c39fde297db22824e507f7549f Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 31 Jul 2024 11:07:39 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=8F=AD=E7=BB=84?=
=?UTF-8?q?=E7=AE=A1=E7=90=86--=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=8C=E4=BB=A5=E5=8F=8A=E5=88=97=E5=90=8D?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yxt-as-ui/src/views/basicinformation/team/team.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/yxt-as-ui/src/views/basicinformation/team/team.vue b/yxt-as-ui/src/views/basicinformation/team/team.vue
index cf691f6668..437645d381 100644
--- a/yxt-as-ui/src/views/basicinformation/team/team.vue
+++ b/yxt-as-ui/src/views/basicinformation/team/team.vue
@@ -30,9 +30,9 @@
-
-
+
+
From 440e9d8152fe2d283ac6ade656419233a9ceefa0 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 31 Jul 2024 11:09:18 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=B4=A2=E8=B5=94?=
=?UTF-8?q?=E5=8E=82=E5=AE=B6=E7=AE=A1=E7=90=86--=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=EF=BC=8C=E4=BB=A5=E5=8F=8A?=
=?UTF-8?q?=E5=88=97=E5=90=8D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../claimantManufacturer/claimantManufacturer.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/yxt-as-ui/src/views/basicinformation/claimantManufacturer/claimantManufacturer.vue b/yxt-as-ui/src/views/basicinformation/claimantManufacturer/claimantManufacturer.vue
index 8268b177e6..b67b520382 100644
--- a/yxt-as-ui/src/views/basicinformation/claimantManufacturer/claimantManufacturer.vue
+++ b/yxt-as-ui/src/views/basicinformation/claimantManufacturer/claimantManufacturer.vue
@@ -31,9 +31,9 @@
-
+
-
+
From 3700c3bea3c8622d88d2e3a20b05b53568fc9df6 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 31 Jul 2024 11:11:58 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=99=84=E5=8A=A0?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86--=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E6=8B=BC=E9=9F=B3=E7=BC=A9=E5=86=99=E4=B8=BA=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E7=BC=96=E7=A0=81=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../additionitem/additionitem.vue | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue b/yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue
index 362e3410d6..eaba1bfecc 100644
--- a/yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue
+++ b/yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue
@@ -35,7 +35,7 @@
-
+
@@ -59,7 +59,7 @@
- 拼音缩写
+ 项目编码
{{ formobj.aitemCode }}
@@ -83,6 +83,11 @@
+
+
+ 注:附加项目销售价填写时应为不含税价格。
+
+