重庆相关接口修改
This commit is contained in:
parent
71457b9f0b
commit
47305d2f62
|
|
@ -50,7 +50,7 @@ const index = {
|
|||
},
|
||||
async singleNotice (data = {} , header = {}){
|
||||
return await Http.get(
|
||||
HttpConfig.basePath,
|
||||
HttpConfig.systemPath,
|
||||
HttpConfig.serviceUrl.index.singleNotice,
|
||||
data,
|
||||
header
|
||||
|
|
@ -251,7 +251,7 @@ const newInStore = {
|
|||
},
|
||||
async fetchNewBuyDetail (data = {} , header = {}){
|
||||
return await Http.get(
|
||||
HttpConfig.basePath,
|
||||
HttpConfig.materialPath,
|
||||
HttpConfig.serviceUrl.newInStore.fetchNewBuyDetail,
|
||||
data,
|
||||
header
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ class HttpConfig {
|
|||
},
|
||||
index: {
|
||||
noticeCont: '/sysNotice/getList', // 获取公告内容
|
||||
singleNotice: '/sysNotice/getById', // 查看单个公告
|
||||
singleNotice: '/notice/list', // 查看单个公告
|
||||
waitDo: '/app/getToDoList', // 获取待办事项
|
||||
keyData: '/app/getCriticalData', // 获取关键数据
|
||||
getUserInfo: '/user/getInfo', // 获取用户信息
|
||||
|
|
@ -91,7 +91,7 @@ class HttpConfig {
|
|||
},
|
||||
newInStore: {
|
||||
fetchNewInStoreList: '/purchaseInput/list', // 获取新购入库列表
|
||||
fetchNewBuyDetail: '/purchaseInput/putinDetails', // 获取新购入库详情
|
||||
fetchNewBuyDetail: '/purchaseMacode/putinDetails', // 获取新购入库详情
|
||||
subNewBuy: '/purchaseInput/manageStatus', // 新购明细提交审核
|
||||
},
|
||||
fix: {
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
</view>
|
||||
<view
|
||||
style="background-color: #FCA30D;"
|
||||
v-show="fetch.taskStatus == 31"
|
||||
v-show="fetch.taskStatus == 31 && roles.includes('jjfgs')"
|
||||
@click="toggleOpenModal(fetch)"
|
||||
>
|
||||
<uni-icons style="color: #fff;" type="auth"></uni-icons>
|
||||
|
|
@ -66,15 +66,15 @@
|
|||
</view>
|
||||
<view
|
||||
style="background-color: #FCA30D;"
|
||||
v-show="fetch.taskStatus == 32"
|
||||
v-show="fetch.taskStatus == 32 && roles.includes('sgb')"
|
||||
@click="toggleOpenModal(fetch)"
|
||||
>
|
||||
<uni-icons style="color: #fff;" type="auth"></uni-icons>
|
||||
施工部审核
|
||||
施管部审核
|
||||
</view>
|
||||
<view
|
||||
style="background-color: #FCA30D;"
|
||||
v-show="fetch.taskStatus == 117"
|
||||
v-show="fetch.taskStatus == 117 && roles.includes('jjfgs')"
|
||||
@click="toggleOpenModal(fetch)"
|
||||
>
|
||||
<uni-icons style="color: #fff;" type="auth"></uni-icons>
|
||||
|
|
@ -635,6 +635,13 @@ import { basePath } from '../../public'
|
|||
onShow() {
|
||||
let that = this
|
||||
console.log(that.roles);
|
||||
for (let i = 0; i < that.roles.length; i++) {
|
||||
if (that.roles[i] == 'em02') {
|
||||
that.roles[i] = 'jjfgs'
|
||||
} else if (that.roles[i] == 'em01') {
|
||||
that.roles[i] = 'sgb'
|
||||
}
|
||||
}
|
||||
if (that.roles.includes('admin')) that.roles = ['admin', 'fgs', 'sgb', 'ajb', 'jjfgs', 'tsfgs']
|
||||
that.initFetch()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,6 +103,9 @@
|
|||
export default {
|
||||
data() {
|
||||
return {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageTotal: 0,
|
||||
taskId: '',
|
||||
allChecked: false,
|
||||
inputs: "",
|
||||
|
|
@ -299,44 +302,54 @@
|
|||
}).catch(err => {
|
||||
console.log(err);
|
||||
})
|
||||
},
|
||||
fetchNewList () {
|
||||
let that = this
|
||||
// 初始化请求新购入库详情
|
||||
that.$api.newInStore.fetchNewBuyDetail({
|
||||
pageNum: that.pageNum,
|
||||
pageSize: that.pageSize,
|
||||
taskId: that.taskId
|
||||
}).then(res => {
|
||||
console.log(res);
|
||||
if (res.data.code == 200) {
|
||||
that.pageTotal = res.data.total
|
||||
res.data.rows.forEach(item => {
|
||||
if (item.status == '0') item.checked = false
|
||||
switch (item.status) {
|
||||
case '1':
|
||||
item.CNstatus = '已入库'
|
||||
break;
|
||||
case '2':
|
||||
item.CNstatus = '入库驳回'
|
||||
break;
|
||||
case '0':
|
||||
item.CNstatus = '待审核'
|
||||
break;
|
||||
}
|
||||
})
|
||||
that.list = [...that.list, ...res.data.rows]
|
||||
} else {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: res.data.msg
|
||||
})
|
||||
}
|
||||
}).catch(err => {
|
||||
console.log(err);
|
||||
})
|
||||
}
|
||||
},
|
||||
onLoad(params) {
|
||||
let that = this
|
||||
console.log(params.taskId);
|
||||
that.taskId = params.taskId
|
||||
// 初始化请求新购入库详情
|
||||
that.$api.newInStore.fetchNewBuyDetail({
|
||||
taskId: params.taskId
|
||||
}).then(res => {
|
||||
console.log(res);
|
||||
if (res.data.code == 200) {
|
||||
for (let i = 0; i < res.data.data.length; i++) {
|
||||
if (res.data.data[i].status == '0') {
|
||||
res.data.data[i].checked = false
|
||||
}
|
||||
switch (res.data.data[i].status) {
|
||||
case '1':
|
||||
res.data.data[i].CNstatus = '已入库'
|
||||
break;
|
||||
case '2':
|
||||
res.data.data[i].CNstatus = '入库驳回'
|
||||
break;
|
||||
case '0':
|
||||
res.data.data[i].CNstatus = '待审核'
|
||||
break;
|
||||
}
|
||||
}
|
||||
that.list = res.data.data
|
||||
} else {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: res.data.msg
|
||||
})
|
||||
}
|
||||
}).catch(err => {
|
||||
console.log(err);
|
||||
})
|
||||
that.fetchNewList()
|
||||
},
|
||||
onReachBottom() {
|
||||
if (this.list.length >= this.pageTotal) return;
|
||||
this.pageNum++
|
||||
this.fetchNewList()
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,10 @@
|
|||
<view>公告标题：{{ listData.noticeTitle }}</view>
|
||||
<view>创建者：{{ listData.createBy }}</view>
|
||||
<view>创建时间：{{ listData.createTime }}</view>
|
||||
<view style="word-wrap: break-word;">公告内容：{{ listData.noticeContent }}</view>
|
||||
<view>公告内容：
|
||||
<view style="margin-top: 15rpx;" v-html="listData.noticeContent">
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
|
@ -23,21 +26,22 @@ export default {
|
|||
},
|
||||
onLoad(params) {
|
||||
let that = this;
|
||||
that.listData = ''
|
||||
console.log(params.noticeId);
|
||||
// 初始化请求单个公告详情
|
||||
that.$api.index
|
||||
.singleNotice({
|
||||
noticeId: params.noticeId
|
||||
})
|
||||
.singleNotice(params.noticeId)
|
||||
.then(res => {
|
||||
console.log(res);
|
||||
if (res.data.code == 200) {
|
||||
that.listData = res.data.data;
|
||||
let centent = decodeURIComponent(
|
||||
res.data.rows.forEach(item => {
|
||||
if (item.noticeId == params.noticeId) that.listData = item
|
||||
})
|
||||
/* let centent = decodeURIComponent(
|
||||
escape(atob(that.listData.noticeContent))
|
||||
);
|
||||
that.listData.noticeContent = this.extractTextFromHTML(centent).replace(/ /ig, "");
|
||||
console.log(that.listData.noticeContent);
|
||||
console.log(that.listData.noticeContent); */
|
||||
}
|
||||
})
|
||||
.catch(err => {
|
||||
|
|
@ -53,6 +57,7 @@ export default {
|
|||
margin: 20rpx auto;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow-x: auto;
|
||||
view {
|
||||
margin-bottom: 15rpx;
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -10222,7 +10222,7 @@ var render = function () {
|
|||
staticStyle: { color: "#fff" },
|
||||
attrs: { _i: "29-" + $30 },
|
||||
}),
|
||||
_vm._v("施工部审核"),
|
||||
_vm._v("施管部审核"),
|
||||
],
|
||||
1
|
||||
),
|
||||
|
|
@ -31298,8 +31298,16 @@ var render = function () {
|
|||
]),
|
||||
_c(
|
||||
"uni-view",
|
||||
{ staticStyle: { "word-wrap": "break-word" }, attrs: { _i: 5 } },
|
||||
[_vm._v("公告内容：" + _vm._$g(5, "t0-0"))]
|
||||
{ attrs: { _i: 5 } },
|
||||
[
|
||||
_vm._v("公告内容："),
|
||||
_c("uni-view", {
|
||||
staticStyle: { "margin-top": "15rpx" },
|
||||
attrs: { _i: 6 },
|
||||
domProps: { innerHTML: _vm._s(_vm._$g(6, "v-html")) },
|
||||
}),
|
||||
],
|
||||
1
|
||||
),
|
||||
],
|
||||
1
|
||||
|
|
@ -31402,7 +31410,7 @@ if(false) {}
|
|||
var ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ../../../../HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/runtime/api.js */ 16);
|
||||
exports = ___CSS_LOADER_API_IMPORT___(false);
|
||||
// Module
|
||||
exports.push([module.i, "@charset \"UTF-8\";\r\n/**\r\n * 这里是uni-app内置的常用样式变量\r\n *\r\n * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量\r\n * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App\r\n *\r\n */\r\n/**\r\n * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能\r\n *\r\n * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件\r\n */\r\n/* 颜色变量 */\r\n/* 行为相关颜色 */\r\n/* 文字基本颜色 */\r\n/* 背景颜色 */\r\n/* 边框颜色 */\r\n/* 尺寸变量 */\r\n/* 文字尺寸 */\r\n/* 图片尺寸 */\r\n/* Border Radius */\r\n/* 水平间距 */\r\n/* 垂直间距 */\r\n/* 透明度 */\r\n/* 文章场景相关 */\n.notice-data {\r\n width: 90%;\r\n margin: 20rpx auto;\r\n display: flex;\r\n flex-direction: column;\n}\n.notice-data uni-view {\r\n margin-bottom: 15rpx;\n}\n.notice-data uni-view:last-child {\r\n margin-bottom: 0;\n}\r\n", ""]);
|
||||
exports.push([module.i, "@charset \"UTF-8\";\r\n/**\r\n * 这里是uni-app内置的常用样式变量\r\n *\r\n * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量\r\n * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App\r\n *\r\n */\r\n/**\r\n * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能\r\n *\r\n * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件\r\n */\r\n/* 颜色变量 */\r\n/* 行为相关颜色 */\r\n/* 文字基本颜色 */\r\n/* 背景颜色 */\r\n/* 边框颜色 */\r\n/* 尺寸变量 */\r\n/* 文字尺寸 */\r\n/* 图片尺寸 */\r\n/* Border Radius */\r\n/* 水平间距 */\r\n/* 垂直间距 */\r\n/* 透明度 */\r\n/* 文章场景相关 */\n.notice-data {\r\n width: 90%;\r\n margin: 20rpx auto;\r\n display: flex;\r\n flex-direction: column;\r\n overflow-x: auto;\n}\n.notice-data uni-view {\r\n margin-bottom: 15rpx;\n}\n.notice-data uni-view:last-child {\r\n margin-bottom: 0;\n}\r\n", ""]);
|
||||
// Exports
|
||||
module.exports = exports;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue