bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-cq' into dev-cq

This commit is contained in:
liang.chao 2024-08-07 13:11:36 +08:00
parent 29c3ede63c c67e619d9a
commit daa1173dca
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sgzb-ui/src/views/base/comeAndGo/index.vue
View File

@ -47,8 +47,7 @@
>新建</el-button >新建</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<!-- :disabled="single" -->
<el-button <el-button
type="success" type="success"
plain plain
@ -57,7 +56,7 @@
@click="handlePeople" @click="handlePeople"
>人员配置</el-button >人员配置</el-button
> >
</el-col> </el-col> -->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"

10
sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
View File

@ -363,20 +363,14 @@
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
v-if=" v-if="scope.row.status == '0'"
scope.row.status == '0' &&
scope.row.userIds.includes(userId)
"
@click="pass(scope.row)" @click="pass(scope.row)"
>通过</el-button >通过</el-button
> >
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
v-if=" v-if="scope.row.status == '0'"
scope.row.status == '0' &&
scope.row.userIds.includes(userId)
"
@click="refused(scope.row)" @click="refused(scope.row)"
>不通过</el-button >不通过</el-button
> >

2
sgzb-ui/vue.config.js
View File

@ -42,7 +42,7 @@ module.exports = {
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
// target: `https://z.csgmall.com.cn`, // target: `https://z.csgmall.com.cn`,
target: `http://192.168.2.151:39080`, //超 target: `http://192.168.2.154:39080`, //超
// target: `http://10.40.92.81:8080`, //韩/ // target: `http://10.40.92.81:8080`, //韩/
// target: `http://10.40.92.74:8080`,//旭/ // target: `http://10.40.92.74:8080`,//旭/
// target: `http://10.40.92.138:28080`, //帅 // target: `http://10.40.92.138:28080`, //帅