diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e95ff16..3a5492d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -12,11 +12,11 @@
-
+
-
+
@@ -25,7 +25,7 @@
-
+
@@ -37,12 +37,8 @@
-
+
-
-
-
-
@@ -50,12 +46,10 @@
-
+
-
-
@@ -92,7 +86,6 @@
-
@@ -120,11 +113,12 @@
+
-
+
@@ -151,23 +145,20 @@
1658992730309
+
+
-
+
-
-
-
-
-
-
+
@@ -175,6 +166,10 @@
+
+
+
+
@@ -186,14 +181,14 @@
-
+
-
+
@@ -203,24 +198,18 @@
-
+
-
-
-
+
-
-
-
-
diff --git a/common/http.api.js b/common/http.api.js
index f48ecea..d8dcdea 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -26,10 +26,25 @@ const install = (Vue, vm) => {
let unbindmp = (data = {}) => vm.$u.post('/system/user/unbind_wxmp/', data); //微信小程序解绑
let getDickey = (params={})=>vm.$u.get('/system/dict/', params);//查询字典
+ let userList = (params={})=>vm.$u.get('/system/user/', params);//
+ let deptList = (params={})=>vm.$u.get('/system/dept/', params);//
let getTickets = (params={})=>vm.$u.get('/wf/ticket/', params);//工单查询/wf/ticket/{id}/
let getTicketItem = (id)=>vm.$u.get(`/wf/ticket/${id}/`);//工单详情
let getTicketTransitions = (id)=>vm.$u.get(`/wf/ticket/${id}/transitions/`);//工单按钮查询
+
+ let addNode = (id,data={})=>vm.$u.get(`/wf/ticket/${id}/add_node/`,data);//加签
+ let addNodeEnd = (id,data={})=>vm.$u.get(`/wf/ticket/${id}/add_node_end/`,data);//加签处理
+ let deliver = (id,data={})=>vm.$u.get(`/wf/ticket/${id}/deliver/`,data);//转交工单
+ let ticketHandle = (id,data={})=>vm.$u.get(`/wf/ticket/${id}/handle/`,data);//工单处理
+
+
+ let operationCreat = (data = {}) => vm.$u.post('/opm/operation/', data);//作业
+
+ let areaLists = (data = {}) => vm.$u.get('/am/area/', data);//作业区域
+
let getVisit = (id)=>vm.$u.get(`/vm/visit/${id}/`);//visit查询
+ let vmVisitor = (data={})=>vm.$u.get(`/vm/visitor/`,data);//visit查询
+ let addVisitor = (data={})=>vm.$u.post(`vm/visitor/`,data);//visitor添加
let getRpj = (id)=>vm.$u.get(`/rpm/rpj/${id}`);//rpj查询
let getOpreation = (id)=>vm.$u.get(`/opm/operation/${id}/`);//rpj查询
@@ -43,14 +58,21 @@ const install = (Vue, vm) => {
wxmplogin,
bindmp,
unbindmp,
+ userList,
+ deptList,
getDickey,
getTickets,
getTicketItem,
getTicketTransitions,
getVisit,
+ vmVisitor,
+ addVisitor,
getRpj,
getOpreation,
- getOpl
+ getOpl,
+
+ operationCreat,
+ areaLists
};
}
diff --git a/pages.json b/pages.json
index 5824cbc..780cb70 100644
--- a/pages.json
+++ b/pages.json
@@ -16,6 +16,12 @@
"navigationBarTitleText": "密码登录",
"enablePullDownRefresh": false
}
+ },{
+ "path": "pages/login/userRegister",
+ "style": {
+ "navigationBarTitleText": "新用户注册",
+ "enablePullDownRefresh": false
+ }
},
{
"path" : "pages/login/login",
@@ -109,6 +115,22 @@
"enablePullDownRefresh": false
}
},
+ {
+ "path": "pages/workSpace/newWork/userList",
+ "style": {
+ "navigationBarTitleText": "选择人员",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/workSpace/newWork/addUser",
+ "style": {
+ "navigationBarTitleText": "添加人员",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+ },
{
"path": "pages/workSpace/list/opreation",
"style": {
diff --git a/pages/home/detail/addNode.vue b/pages/home/detail/addNode.vue
index 9e1e5b1..bc5d787 100644
--- a/pages/home/detail/addNode.vue
+++ b/pages/home/detail/addNode.vue
@@ -3,29 +3,103 @@
+
+
+ *
+ 加签给
+
+
+
+
+
+
+
+
+ *
+ 转交给
+
+
+
+
+
+
*
- 加签原因
+ {{labelText}}
-
+
-
+
\ No newline at end of file
+
diff --git a/pages/home/detail/ticketHandle.vue b/pages/home/detail/ticketHandle.vue
index d58d5dd..8eadb6a 100644
--- a/pages/home/detail/ticketHandle.vue
+++ b/pages/home/detail/ticketHandle.vue
@@ -364,7 +364,21 @@
-
+
+
+
+ *
+ 作业情况
+
+
+
+
+
+ *
+ 关闭处理
+
+
+
*
@@ -372,20 +386,19 @@
-
+
-
-
+
-
-
@@ -396,26 +409,7 @@
var that;
var promise;
export default {
- name: "fafangbaogao_apply",
- watch: {
- /* 文件下载监听 */
- lsDownLoadImg(newVal, oldVal) {
- let val = newVal;
- if (String(newVal).indexOf(",") > -1) {
- val = String(newVal).split(",")[0] === "true";
- }
- this.$set(this.downFiles, 'downLoadImg' + this.lsFileId, val)
- },
- /* 文件下载监听 */
- principal(newVal, oldVal) {
- if (!this.itemId) {
- if (oldVal.roleId === undefined && newVal.roleId !== undefined) {
- this.formData.itemInfo.applicationDept = newVal.deptId
- this.formData.applicationDept = newVal.deptId
- }
- }
- },
- },
+ name: "ticketHandle",
data() {
const currentDate = this.getDate({
format: true
@@ -434,19 +428,7 @@
detail: false,
isDisabled: false,
btnShow: true,
- lsId: "",
- sta: null,
- eventStatus: "",
- execId: '',
- // 2022年3月20日
- result: [],
- // 文件进度
- imgFlag: false,
- //文件下载
- downFiles: {},
- timeShow: false,
- // 发布网站
- releaseWeb: [],
+
ticketDetail: {},
visitDetail: {},
rpjDetail: {},
@@ -517,6 +499,24 @@
40: "进行中",
50: "已完成",
},
+ noteOption: [{
+ value: 10,
+ text: '作业正常结束'
+ },
+ {
+ value: 20,
+ text: '因计划改变停止作业'
+ },
+ {
+ value: 30,
+ text: '因发生异常终止作业'
+ },
+ {
+ value: 40,
+ text: '其他'
+ },
+ ],
+ dosOption: [],
}
},
computed: {
@@ -534,7 +534,7 @@
that.ticketId = params.ticketId;
that.projectId = params.projectId;
that.cateType = params.cateType;
- that.operation = params.operation;
+ that.type = params.type;
},
onShow() {
if (this.cateType === 'visit') {
@@ -542,12 +542,7 @@
} else if (this.cateType === 'rparty') {
this.getRpj();
} else {
- if (this.operation !== null) {
- this.getOperation();
- this.getOpl();
- } else {
- this.getOpl();
- }
+ this.getOpl();
// this.getCloseDos();
}
this.getticketItem();
@@ -574,14 +569,6 @@
});
},
- //作业详情
- getOperation() {
- // debugger;
- this.$u.api.getOpreation(this.operation).then((res) => {
- // debugger;
- this.opreationDetail = res;
- });
- },
//许可证详情
getOpl() {
this.$u.api.getOpl(this.projectId).then((res) => {
@@ -678,6 +665,15 @@
delta: 1
})
},
+
+ //加签
+ addNode() {
+ const params = `?ticketId=${this.ticketId}&type='add'`;
+ uni.navigateTo({
+ url: '../detail/addNode' + params,
+ })
+ },
+
operationSubmit(id) {
let params = new Object();
params.transition = id;
diff --git a/pages/home/list/ticket.vue b/pages/home/list/ticket.vue
index d499389..4a3bda8 100644
--- a/pages/home/list/ticket.vue
+++ b/pages/home/list/ticket.vue
@@ -77,7 +77,7 @@
getTicketLists() {
let that = this;
let obj = {};
- obj.category = 'duty';
+ obj.category = 'all';
obj.pageNum = this.pageNum;
obj.pageSize = this.pageSize;
if (that.search !== '') {
@@ -90,20 +90,14 @@
})
},
ticketHandle(val) {
- let projectId = '',//项目、许可证Id
- operation = null;//作业id
+ let projectId = val.ticket_data.opl;//项目、许可证Id
let catetype = val.workflow_.key;
- if (catetype === 'visit') {
- projectId = val.ticket_data.visit;
- } else if (catetype === 'Fire') {
- projectId = val.ticket_data.opl;
- operation = val.ticket_data.operation ? val.ticket_data.operation : null;
- }
- const params = `?ticketId=${val.id}&projectId=${projectId}&cateType=${catetype}&operation=${operation}`;
+ const params = `?ticketId=${val.id}&projectId=${projectId}&cateType=${catetype}&type='handle'`;
uni.navigateTo({
url: '../detail/ticketHandle' + params,
})
},
+
goBack() {
uni.navigateBack({
delta: 1
diff --git a/pages/login/login_.vue b/pages/login/login_.vue
index 604d5cd..2f03382 100644
--- a/pages/login/login_.vue
+++ b/pages/login/login_.vue
@@ -67,12 +67,10 @@
-
- 第三方登录
-
+ 新用户注册
-
-
+
+
@@ -293,6 +291,11 @@
this.isMessage = true;
}
},
+ userRegister(){
+ uni.navigateTo({
+ url: '/pages/login/userRegister'
+ })
+ },
formSubmit(e) {
var that = this;
const obj = e.target.value;
@@ -326,13 +329,14 @@
// 获取验证码
getCode() {
debugger;
+ console.log(this.phoneNumber)
if (this.phoneNumber !== '') {
uni.showLoading({
title: '正在获取验证码',
mask: true
})
this.$u.api.getCode({
- phone: 16619852123
+ phone: this.phoneNumber
}).then(res => {
setTimeout(() => {
uni.hideLoading();
diff --git a/pages/login/userRegister.vue b/pages/login/userRegister.vue
new file mode 100644
index 0000000..5cdca68
--- /dev/null
+++ b/pages/login/userRegister.vue
@@ -0,0 +1,528 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 我已阅读并同意《用户协议》和《隐私政策》
+
+
+
+
+ {{content}}
+
+
+
+
+
+
diff --git a/pages/workSpace/newWork/addUser.vue b/pages/workSpace/newWork/addUser.vue
new file mode 100644
index 0000000..cc9ffb1
--- /dev/null
+++ b/pages/workSpace/newWork/addUser.vue
@@ -0,0 +1,179 @@
+
+
+
+
+
+
+ 姓名
+
+
+
+
+
+ 手机号
+
+
+
+
+
+ 身份证号
+
+
+
+
+
+ 证件照
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
diff --git a/pages/workSpace/newWork/userList.vue b/pages/workSpace/newWork/userList.vue
new file mode 100644
index 0000000..66b6242
--- /dev/null
+++ b/pages/workSpace/newWork/userList.vue
@@ -0,0 +1,161 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增人员
+
+
+
+
+
+
+
+
diff --git a/pages/workSpace/newWork/visit.vue b/pages/workSpace/newWork/visit.vue
index a0ddbcd..c2f70d8 100644
--- a/pages/workSpace/newWork/visit.vue
+++ b/pages/workSpace/newWork/visit.vue
@@ -10,7 +10,7 @@
来访事由
-
+
@@ -20,16 +20,17 @@
来访概述
-
+
-
+
*
来访详述
-
+
@@ -39,8 +40,8 @@
来访时间
-
- {{formData.start_time}}
+
+ {{formData.visit_time}}
@@ -50,8 +51,8 @@
离开时间
-
- {{formData.end_time}}
+
+ {{formData.leave_time}}
@@ -61,7 +62,7 @@
接待人
-
+
@@ -71,7 +72,7 @@
来访单位
-
+
@@ -80,7 +81,8 @@
来访级别
-
+
+
@@ -89,13 +91,11 @@
来访人数
-
+
-
-
- 保存
+ 下一步
@@ -107,28 +107,7 @@
var that;
var promise;
export default {
- name: "fafangbaogao_apply",
- // mixins: [myMixin],
- watch: {
- /* 文件下载监听 */
-
- lsDownLoadImg(newVal, oldVal) {
- let val = newVal;
- if (String(newVal).indexOf(",") > -1) {
- val = String(newVal).split(",")[0] === "true";
- }
- this.$set(this.downFiles, 'downLoadImg' + this.lsFileId, val)
- },
- /* 文件下载监听 */
- principal(newVal, oldVal) {
- if (!this.itemId) {
- if (oldVal.roleId === undefined && newVal.roleId !== undefined) {
- this.formData.itemInfo.applicationDept = newVal.deptId
- this.formData.applicationDept = newVal.deptId
- }
- }
- },
- },
+ name: "visit",
data() {
const currentDate = this.getDate({
format: true
@@ -136,17 +115,15 @@
return {
date: currentDate,
formData: {
- name: '', //作业简述
- state: '', //作业状态
- place: '', //具体地点
- start_time: currentDate, //作业开始时间
- end_time: currentDate, //作业结束时间
- state_work: '', //生产状态
- belong_dept: '', //所属部门
- area: '', //作业区域
- dept_ter: '', //属地部门
- dept_bus: '', //业务部门
- coordinator: '', //业务部门协调员
+ name: '', //来访概述
+ purpose: '', //来访事由
+ receptionist: '', //接待人
+ visit_time: currentDate, //来访时间
+ leave_time: currentDate, //离开时间
+ description: '', //来访详述
+ company: '', //来访单位
+ level: '', //来访级别
+ count_people: '', //来访人数
},
depRange: [],
@@ -174,50 +151,27 @@
createTimeFromShow: false,
createTimeFromList: [],
createTimeFromCon: '',
- depRange: [{
- label: "name1",
- id: 1
- }, {
- label: "name2",
- id: 2
- }],
-
range: [{
- value: 0,
- text: "运行"
- },
- {
- value: 1,
- text: "停机"
- },
- {
- value: 2,
- text: "检修"
- },
- ],
- dataTree: [{
- text: "曲阳金隅",
- value: "1",
- children: [{
- text: "设计部",
- value: "11",
- children: [{
- text: "设计一部",
- value: "111"
- },
- {
- text: "设计一部",
- value: "112"
- }
- ]
- },
- {
- text: "12生产部",
- value: "12"
- }
- ]
- }]
-
+ text: "参观",
+ value: 10
+ }, {
+ text: "拜访",
+ value: 20
+ }, {
+ text: "面试",
+ value: 30
+ }, {
+ text: "开会",
+ value: 40
+ }],
+ levelRange: [{
+ text: "一般",
+ value: 10
+ }, {
+ text: "重要",
+ value: 20
+ }],
+ userRange:[],
}
},
computed: {
@@ -228,50 +182,24 @@
return this.getDate('end');
}
},
- onLoad(params) {
- /* that = this;
-
- promise = new Promise(function(resolve, reject) {
- that.nodeFn();
- that.createTimeFromFn();
- resolve()
- })
- promise.then(function(){
- if (Object.keys(params).length > 0) {
- console.log(params.itemId)
- that.itemId = params.itemId;
- that.pkId = params.pkId;
- that.eventStatus = params.eventStatus;
- that.execId = params.execId;
- if (params.detail !== undefined && params.detail !== null && params.detail !== "") {
- if (typeof params.detail === "string") {
- that.detail = JSON.parse(params.detail);
- } else if (typeof params.detail === "boolean") {
- that.detail = params.detail
- }
- }
- that._initPrintList()
- }
- })
- */
- },
+
onShow() {
- /* that._getDeptListMenu();
- var timestamp = (new Date()).valueOf();
- that.formData.createTimeTo = that.happenTimeFun(timestamp); */
+ this.getUserRange();
},
methods: {
- onnodeclick(e) {
- console.log(e);
- },
- onpopupopened(e) {
- console.log('popupopened');
- },
- onpopupclosed(e) {
- console.log('popupclosed');
- },
- onchange(e) {
- console.log('onchange:', e);
+ //获取用户
+ getUserRange() {
+ this.$u.api.userList({page: 0}).then(res => {
+ let user = [];
+ let obj = {};
+ res.forEach(item => {
+ obj = {value: null,text: ''};
+ obj.value = item.id;
+ obj.text = item.name;
+ user.push(obj);
+ })
+ this.userRange = user
+ })
},
getDate(type) {
const date = new Date();
@@ -320,588 +248,8 @@
that.formData.createTimeFrom = that.createTimeFromList[index].id
that.createTimeFromCon = that.createTimeFromList[index].label
},
- //发布网站
- nodeFn() {
- var data = {
- dictCode: "FBWZ"
- }
- node(data).then(res => {
- console.log(res)
- if (res.statusCode === 200) {
- if (res.data.data !== undefined && res.data.data !== null && res.data.data !== "") {
- for (let i = 0; i < res.data.data.length; i++) {
- res.data.data[i].checked = false;
- }
- }
- that.releaseWeb = res.data.data;
-
- } else {
- uni.showToast({
- title: res.data.message,
- icon: 'none'
- })
- }
- }).catch(err => {
- uni.showToast({
- title: '网络异常, 请求失败',
- icon: 'none'
- })
- })
- },
- //信息有效期
- createTimeFromFn() {
- var data = {
- dictCode: "XXYXSC"
- }
- node(data).then(res => {
- if (res.statusCode === 200) {
- if (res.data.data !== undefined && res.data.data !== null && res.data.data !== "") {
- that.createTimeFromList = res.data.data;
- }
- } else {
- uni.showToast({
- title: res.data.message,
- icon: 'none'
- })
- }
- }).catch(err => {
- uni.showToast({
- title: '网络异常, 请求失败',
- icon: 'none'
- })
- })
- },
- /* 文件删除 */
- delFile(index) {
- this.formData.newsBulletinFiles.splice(index, 1);
- },
- /* 文件上传 */
- onClickOpenMyFile() {
- if (this.imgFlag) return;
- var zzzzzzzzz = this;
- const token = uni.getStorageSync('my_token');
- let platform = uni.getSystemInfoSync().platform;
-
-
-
- plus.nativeUI.actionSheet({
- cancel: "取消",
- buttons: [{
- title: "照片"
- },
- {
- title: "相机"
- },
- {
- title: "手机文件"
- },
- ]
- },
- function(e) {
- if (e.index == 1 || e.index == 2) {
- let sourceType = ["album", "camera"];
- if (e.index == 1) {
- sourceType = ["album"];
- } else if (e.index == 2) {
- sourceType = ["camera"];
- }
- uni.chooseImage({
- count: 1,
- sourceType,
- success: ((res1) => {
- zzzzzzzzz.imgFlag = true;
- if (res1.errMsg === "chooseImage:ok") {
- const tempFilePaths = res1.tempFilePaths[0];
- if (tempFilePaths !== undefined && tempFilePaths !== null &&
- tempFilePaths !== "") {
- let myFiles = []
- // 这种是直接从相册选的
- // 直接上传
- if (tempFilePaths.indexOf("file:") > -1) {
- let myFile = {};
- myFile.uri = tempFilePaths;
- myFile.name = "file";
- myFiles.push(myFile)
- } else {
- let myFile = {};
- var ccc = 'file://' + plus.io
- .convertLocalFileSystemURL(tempFilePaths);
- myFile.uri = ccc;
- myFile.name = "file";
- myFiles.push(myFile)
- }
- let uploadTask = uni.uploadFile({
- url: myUploadFileUrl,
- header: {
- 'Content-Type': 'multipart/form-data',
- 'Authorization': 'bearer ' + token
- },
- files: myFiles,
- success: ((res_c) => {
- if (res_c.statusCode === 200) {
- let fileData = {};
- if (typeof res_c.data ==
- "string") {
- fileData = JSON.parse(res_c
- .data).data;
- } else {
- fileData = res_c.data.data;
- }
- if (fileData.fileId !== null &&
- fileData.fileId !==
- undefined && fileData
- .fileName !== undefined &&
- fileData.fileName !== null
- ) {
- zzzzzzzzz.imgFlag = false;
-
- zzzzzzzzz.$set(zzzzzzzzz
- .downFiles,
- 'downLoadImg' +
- fileData.fileId,
- false);
- const obj = {};
- obj.fileId = fileData
- .fileId + "";
- obj.fileName = fileData
- .fileName;
- zzzzzzzzz.formData
- .newsBulletinFiles
- .push(obj);
- uni.showToast({
- icon: "none",
- title: "上传成功"
- })
- } else {
- zzzzzzzzz.imgFlag = false;
- uni.showToast({
- icon: "none",
- title: "缺少fileData.fileId, 上传文件失败"
- })
- }
- } else {
- zzzzzzzzz.imgFlag = false;
- uni.showToast({
- icon: "none",
- title: res_c.data
- .message ||
- "上传文件失败"
- })
- }
- }),
- fail: (() => {
- zzzzzzzzz.imgFlag = false;
- uni.showToast({
- icon: "none",
- title: "上传文件失败"
- })
- })
- })
-
- }
- } else {
- zzzzzzzzz.imgFlag = false;
- uni.showToast({
- icon: "none",
- title: "获取文件失败"
- })
- }
- }),
- fail: (() => {
- zzzzzzzzz.imgFlag = false;
- uni.showToast({
- icon: "none",
- title: "取消选择文件"
- })
- })
- });
- } else if (e.index == 3) {
- if (platform === "android") {
- plugin.chooseFileAction({
- maxNum: 1, // 最大数量
- isNeedDetail: true, // 是否返回具体的信息
- btnText: "选择", // 右下角的文字
- fileTypes: ["doc", "docx", "xls", "xlsx", "pdf", "png", "jpg"], // 支持的类型
- extraApps: ["qqbrowser", "dingtalk"], // 额外支持的应用,QQ浏览器、钉钉
- }, (res) => {
- if (res.code === "0") {
- // console.log(res.dataDetail[0].path);
- zzzzzzzzz.imgFlag = true;
- if (res.dataDetail[0].path !== undefined && res.dataDetail[0].path !==
- null && res.dataDetail[0].path !== "") {
- let url = decodeURI(res.dataDetail[0].path);
- plus.io.resolveLocalFileSystemURL(url, function(entry) {
- let result = 'file://' + entry.fullPath;
-
- let myFile = {};
- myFile.uri = result;
- myFile.name = "file";
- let myFiles = []
- myFiles.push(myFile)
-
- let uploadTask = uni.uploadFile({
- url: myUploadFileUrl,
- header: {
- 'Content-Type': 'multipart/form-data',
- 'Authorization': 'bearer ' + token
- },
- files: myFiles,
- success: ((res_c) => {
- if (res_c.statusCode === 200) {
- let fileData = {};
- if (typeof res_c.data ==
- "string") {
- fileData = JSON.parse(
- res_c.data)
- .data;
- } else {
- fileData = res_c.data
- .data;
- }
- if (fileData.fileId !==
- null && fileData
- .fileId !==
- undefined && fileData
- .fileName !==
- undefined && fileData
- .fileName !== null) {
- zzzzzzzzz.imgFlag =
- false;
-
- zzzzzzzzz.$set(
- zzzzzzzzz
- .downFiles,
- 'downLoadImg' +
- fileData
- .fileId, false);
- const obj = {};
- obj.fileId = fileData
- .fileId + "";
- obj.fileName = fileData
- .fileName;
- zzzzzzzzz.formData
- .newsBulletinFiles
- .push(obj);
- uni.showToast({
- icon: "none",
- title: "上传成功"
- })
- } else {
- zzzzzzzzz.imgFlag =
- false;
- uni.showToast({
- icon: "none",
- title: "缺少fileData.fileId, 上传文件失败"
- })
- }
- } else {
- zzzzzzzzz.imgFlag = false;
- uni.showToast({
- icon: "none",
- title: res_c
- .data
- .message ||
- "上传文件失败"
- })
- }
- }),
- fail: (() => {
- zzzzzzzzz.imgFlag = false;
- uni.showToast({
- icon: "none",
- title: "上传文件失败"
- })
- })
- })
-
- }, function(e) {
- zzzzzzzzz.imgFlag = false;
- console.log("读取文件出错: " + e.message);
- uni.showToast({
- icon: "none",
- title: "读取文件出错" + e.message
- })
- });
- } else {
- zzzzzzzzz.imgFlag = false;
- uni.showToast({
- icon: "none",
- title: "读取文件出错"
- })
- }
- } else {
- zzzzzzzzz.imgFlag = false;
- uni.showToast({
- icon: "none",
- title: res.msg
- })
- }
- });
- /*
- plug.filePicker({
- bgcolor: "#42b983",
- title: "文件选择",
- max: 1,
- fileTypes: ["doc", "docx", "xls", "xlsx", "pdf", "jpg", "png"]
- }, ret => {
- zzzzzzzzz.imgFlag = true;
- if (ret.fileList[0].path !== undefined && ret.fileList[0].path !== null && ret.fileList[0].path !== "") {
- let url = decodeURI(ret.fileList[0].path);
- plus.io.resolveLocalFileSystemURL(url, function(entry) {
- let result = 'file://' + entry.fullPath;
-
- let myFile = {};
- myFile.uri = result;
- myFile.name = "file";
- let myFiles = []
- myFiles.push(myFile)
-
- let uploadTask = uni.uploadFile({
- url: myUploadFileUrl,
- header: {
- 'Content-Type': 'multipart/form-data',
- 'Authorization': 'bearer ' + token
- },
- files: myFiles,
- success: ((res_c) => {
- if (res_c.statusCode === 200) {
- let fileData = {};
- if (typeof res_c.data == "string") {
- fileData = JSON.parse(res_c.data).data;
- } else {
- fileData = res_c.data.data;
- }
- if (fileData.fileId !== null && fileData.fileId !== undefined && fileData.fileName !== undefined && fileData.fileName !== null) {
- zzzzzzzzz.imgFlag = false;
-
- zzzzzzzzz.$set(zzzzzzzzz.downFiles,'downLoadImg'+fileData.fileId,false);
- const obj = {};
- obj.fileId = fileData.fileId + "";
- obj.fileName = fileData.fileName;
- zzzzzzzzz.formData.newsBulletinFiles.push(obj);
- uni.showToast({
- icon: "none",
- title: "上传成功"
- })
- } else {
- zzzzzzzzz.imgFlag = false;
- uni.showToast({
- icon: "none",
- title: "缺少fileData.fileId, 上传文件失败"
- })
- }
- } else {
- zzzzzzzzz.imgFlag = false;
- uni.showToast({
- icon: "none",
- title: res_c.data.message || "上传文件失败"
- })
- }
- }),
- fail: (() => {
- zzzzzzzzz.imgFlag = false;
- uni.showToast({
- icon: "none",
- title: "上传文件失败"
- })
- })
- })
-
- }, function(e) {
- zzzzzzzzz.imgFlag = false;
- console.log("读取文件出错: " + e.message);
- uni.showToast({
- icon: "none",
- title: "读取文件出错" + e.message
- })
- });
- } else {
- zzzzzzzzz.imgFlag = false;
- uni.showToast({
- icon: "none",
- title: "读取文件出错"
- })
- }
- });
- */
- } else if (platform === "ios") {
- file.select({
- type: [
- "public.data",
- "com.microsoft.powerpoint.ppt",
- "com.microsoft.word.doc",
- "com.microsoft.excel.xls",
- "org.openxmlformats.presentationml.presentation", // pptx
- "org.openxmlformats.wordprocessingml.document", // docx
- "org.openxmlformats.spreadsheetml.sheet", // xlsx
- "public.avi",
- "public.3gpp",
- "public.mpeg-4",
- "com.compuserve.gif",
- "public.jpeg",
- "public.png",
- "public.plain-text",
- "com.adobe.pdf"
- ],
- model: 0
- }, result => {
- zzzzzzzzz.imgFlag = true;
- if (result.filePath === undefined || result.filePath === null || result
- .filePath === "") {
- uni.showToast({
- icon: "none",
- title: "缺少路径, 无法上传"
- })
- return false;
- }
- let localPath = result.filePath;
- localPath = decodeURI(localPath)
- let myFiles = []
- let myFile = {};
- myFile.uri = localPath;
- myFile.name = "file";
- myFiles.push(myFile);
- let uploadTask = uni.uploadFile({
- url: myUploadFileUrl,
- header: {
- 'Content-Type': 'multipart/form-data',
- 'Authorization': 'bearer ' + token
- },
- files: myFiles,
- success: ((res_c) => {
- console.log(res_c);
- if (res_c.statusCode === 200) {
- let fileData = {};
- if (typeof res_c.data == "string") {
- fileData = JSON.parse(res_c.data).data;
- } else {
- fileData = res_c.data.data;
- }
- if (fileData.fileId !== null && fileData
- .fileId !== undefined && fileData
- .fileName !== undefined && fileData
- .fileName !== null) {
- zzzzzzzzz.imgFlag = false;
-
- zzzzzzzzz.$set(zzzzzzzzz.downFiles,
- 'downLoadImg' + fileData.fileId,
- false);
- const obj = {};
- obj.fileId = fileData.fileId + "";
- obj.fileName = fileData.fileName;
- zzzzzzzzz.formData.newsBulletinFiles.push(
- obj);
- uni.showToast({
- icon: "none",
- title: "上传成功"
- })
- } else {
- zzzzzzzzz.imgFlag = false;
- uni.showToast({
- icon: "none",
- title: "缺少fileData.fileId, 上传文件失败"
- })
- }
- } else {
- zzzzzzzzz.imgFlag = false;
- uni.showToast({
- icon: "none",
- title: res_c.data.message ||
- "上传文件失败"
- })
- }
- }),
- fail: (() => {
- zzzzzzzzz.imgFlag = false;
- uni.showToast({
- icon: "none",
- title: "上传文件失败"
- })
- })
- })
-
- })
- }
- }
- }
- )
- },
-
- /* 回显 */
- _initPrintList() {
- console.log("sasdasasd")
- seeXinwenNew(this.itemId).then(res => {
- if (res.statusCode === 200) {
- let data = res.data.data
- that.formData.id = data.id;
- that.formData.writer = data.writer;
- that.formData.mailbox = data.mailbox;
- that.formData.contactNumber = data.contactNumber;
- that.formData.releaseColumn = data.releaseColumn;
- that.formData.newsInformation = data.newsInformation;
- if (data.typeList != '' && data.typeList != undefined && data.typeList != null) {
- for (let i = 0; i < data.typeList.length; i++) {
- for (let k = 0; k < that.releaseWeb.length; k++) {
- console.log(data.typeList[i], that.releaseWeb[k].id)
- if (data.typeList[i] == that.releaseWeb[k].id) {
- that.releaseWeb[k].checked = true
- }
- }
- }
- }
-
- console.log(data.validityPeriod)
- if (data.validityPeriod != '' && data.validityPeriod != undefined && data.validityPeriod !=
- null) {
- for (let i = 0; i < that.createTimeFromList.length; i++) {
- console.log('zhixingle', that.createTimeFromList[i].id)
- if (that.createTimeFromList[i].id == data.validityPeriod) {
- that.createTimeFromCon = that.createTimeFromList[i].label;
- that.formData.createTimeFrom = that.createTimeFromList[i].id;
- }
- }
- }
-
- that.formData.reason = data.reason;
- that.formData.createTimeTo = data.createTime.substring(0, 10);
- //文件数组
- let files = data.newsBulletinFiles;
- for (let val of files) {
- that.formData.newsBulletinFiles.push({
- fileId: val.fileId,
- fileName: val.fileName
- })
- //文件下载显示进度用
- this.$set(this.downFiles, 'downLoadImg' + val.fileId, false);
- }
- that.formData.itemInfo.itemName = data.itemInfo.itemName;
- that.formData.itemInfo.applicationDept = data.itemInfo.applicationDept;
- that.formData.itemInfo.applicant = data.itemInfo.applicant;
-
- if (data.itemInfo.eventStatus || data.itemInfo.eventStatus == 0) {
- this.sta = Number(data.itemInfo.eventStatus)
- } else {
- this.sta = null
- }
- if (data.itemInfo.eventStatus == 1 || data.itemInfo.eventStatus == 2) {
- this.btnShow = false;
- }
- } else {
- uni.showToast({
- title: res.data.message,
- icon: 'none'
- })
- }
- }).catch(err => {
- uni.showToast({
- title: '网络异常, 请求失败',
- icon: 'none'
- })
- })
- },
-
-
- onSubmit(type) {
+
+ nextHandle(type) {
if (!this.paramsCheck()) return;
if (this.detail && !this.formData.id) {
@@ -1021,155 +369,17 @@
return true;
},
- /* 保存数据 */
- _updatePrintList(data, type) {
- this.formData.createTimeTo = this.formData.createTimeTo + ' ' + '00:00:00'
- this.isDisabled = true;
- let method = "post";
- if (this.detail) {
- /* 是详情页,就使用put请求,申请人自回显处得到。否则为新增页,申请人为当前登录人*/
- if (this.eventStatus == 4) { //未提交的数据
- method = "put";
- } else {
- method = "post";
- const newData = JSON.parse(JSON.stringify(data))
- delete newData.newsBulletinId;
- data = newData;
- }
- } else {
- this.formData.itemInfo.applicant = this.userId;
- }
- bulletinNew(method, data).then(res => {
-
- if (res.statusCode === 200) {
- this.itemId = res.data.data.itemId;
- if (type.indexOf("提交") > -1) {
- this.$refs.submitApproval.submitApproval(this.itemId); /* 创建审批数据 */
- } else {
- /* 临时保存,不需要审批的数据,直接跳转*/
- uni.showToast({
- title: '保存成功',
- icon: 'none',
- duration: 2000,
- success() {
- setTimeout(function() {
- this.isDisabled = false;
- uni.navigateBack({
- delta: 1
- })
- }, 2000)
- }
- })
-
-
- }
- } else {
- this.formData.createTimeTo = this.formData.createTimeTo.substring(0, 10);
- uni.showToast({
- title: res.data.message,
- icon: 'none'
- })
- }
- }).catch(err => {
- this.formData.createTimeTo = this.formData.createTimeTo.substring(0, 10);
- uni.showToast({
- title: '网络异常, 请求失败',
- icon: 'none'
- })
- })
- },
-
- publishChange(e) {
- var i = e.detail.value;
- that.publishRangeCon = that.publishRange[i].name;
- that.formData.scopeOfPublication = that.publishRange[i].id;
- },
+
goBack() {
uni.navigateBack({
delta: 1
})
},
-
- /* 获取部门列表 */
- _getDeptListMenu() {
- getDeptListMenu().then(res => {
- if (res.statusCode === 200) {
- let list = res.data.data;
- this.depRange = list;
-
- // 2022年3月20日
- this.result = [];
- if (list !== undefined && list !== null && list !== "" && Array.isArray(list) && list
- .length > 0) {
- this.result = flatten(list);
- }
-
-
- } else {
- if (res.data.message == "token无效") return;
- uni.showToast({
- title: res.data.message,
- icon: 'none'
- })
- }
- }).catch(err => {
- uni.showToast({
- title: '网络异常, 请求失败',
- icon: 'none'
- })
+ nextHandle(){
+ uni.navigateTo({
+ url: '/pages/workSpace/newWork/userList'
})
},
- onPopupclosed() {
- if (this.lsId) {
- this.formData.itemInfo.applicationDept = this.lsId;
- }
- },
- onNodeClick(e) {
- if (e.id !== undefined && e.id !== null && e.id !== "") {
- this.lsId = e.id;
-
-
- // 2022年3月20日
- const currObj = this.result.find((item) => {
- return item.id == this.lsId
- });
- if (currObj !== undefined && currObj !== null && currObj !== "") {
- console.log(currObj);
- if (currObj.children === null || currObj.children === undefined || currObj.children === "") {
- this.formData.itemInfo.applicationDept = this.lsId;
- }
- }
-
-
-
- }
- },
- /* 选择部门后得到最后部门名称 */
- onchange(e) {
- const value = e.detail.value;
- let lastDepName = "";
- if (value.length > 0) {
- lastDepName = value[value.length - 1].text;
- }
- this.subscribeDeptName = lastDepName || "";
- },
- depChange(e) {
- const idx = e.detail.value;
- this.selectedDep = this.depRange[idx].name;
- },
- tiaoxiuChange(e) {
- const idx = e.detail.value;
- this.selectedtiaoxiu = this.tiaoxiuRange[idx].name;
- this.selectedtiaoxiuId = this.tiaoxiuRange[idx].id;
- that.formData.compensatoryLeave = this.tiaoxiuRange[idx].id;
- },
-
- typeChange(e) {
- const idx = e.detail.value;
- this.selectedtype = this.typeRange[idx].label;
- this.selectedtypeId = this.typeRange[idx].id;
- that.formData.leaveType = this.typeRange[idx].id;
- }
}
}
diff --git a/pages/workSpace/newWork/work.vue b/pages/workSpace/newWork/work.vue
index bc62cbd..e9e3f78 100644
--- a/pages/workSpace/newWork/work.vue
+++ b/pages/workSpace/newWork/work.vue
@@ -12,16 +12,6 @@
-
-
- *
- 作业状态
-
-
-
-
-
-
*
@@ -59,7 +49,7 @@
生产状态
-
+
@@ -70,7 +60,7 @@
作业区域
-
+
@@ -80,9 +70,8 @@
业务部门
-
+
@@ -93,7 +82,7 @@
部门协调员
-
+
@@ -104,15 +93,15 @@
属地部门
-
+
- 保存
+ 下一步
@@ -120,32 +109,10 @@
@@ -1196,7 +607,8 @@
background-color: #f3fbff;
padding-bottom: 227rpx;
}
-/*
+
+ /*
>>>.uni-status-bar {
height: 0 !important;
} */
@@ -1400,7 +812,8 @@
}
/* 主体 */
- >>>.uni-navbar__header,>>>.uni-status-bar {
+ >>>.uni-navbar__header,
+ >>>.uni-status-bar {
background-image: linear-gradient(90deg, #164cc3 0%, #2c6fd9 100%), linear-gradient(#e60012, #e60012) !important;
}
diff --git a/static/login/userRegister.png b/static/login/userRegister.png
new file mode 100644
index 0000000..952968e
Binary files /dev/null and b/static/login/userRegister.png differ