FeiDaBaoKai/wms_client_kate_suzhou
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: FeiDaBaoKai:5e88f7afe668b260c2069f1cdc06808485413092
Branches Tags
FeiDaBaoKai:main
..
compare: FeiDaBaoKai:02c3d6d7ebd44b89853b113467e67a67dc6171ff
Branches Tags
FeiDaBaoKai:main

No commits in common. "5e88f7afe668b260c2069f1cdc06808485413092" and "02c3d6d7ebd44b89853b113467e67a67dc6171ff" have entirely different histories.
5e88f7afe6 ... 02c3d6d7eb

2 changed files with 318 additions and 377 deletions
Show Stats Expand all files Collapse all files

2
src/api/kateLogin.js
View File

@ -1,6 +1,6 @@
import axios from "axios";
axios.defaults.baseURL = 'https://login.microsoftonline.com/caterpillar.onmicrosoft.com'
axios.defaults.timeout = 50000;
axios.defaults.timeout = 5000;
// axios.defaults.withCredentials = true
const postToGetToken = (params) => {

69
src/layout/standSettings.vue
View File

@ -7,10 +7,6 @@
:suffix-icon="Search" />
<el-select-v2 v-model="standTypeQuery" style="width: 158px; margin-right: 10px;"
placeholder="请选择站台类型" :options="standTypeOptions" @change="search()"></el-select-v2>
<el-select-v2 v-model="allowMwlQuery" style="width: 158px; margin-right: 10px;"
placeholder="是否允许装载机" :options="yesOrNoOptions" @change="search()"></el-select-v2>
<el-select-v2 v-model="allowMgQuery" style="width: 158px; margin-right: 10px;"
placeholder="是否允许平地机" :options="yesOrNoOptions" @change="search()"></el-select-v2>
<el-button type="primary" @click="search()">搜索</el-button>
<el-button type="warning" @click="reset()">重置</el-button>
</el-row>
@ -25,14 +21,8 @@
</template>
</el-table-column>
<el-table-column prop="standId" label="id" fixed="left" min-width="120px" show-overflow-tooltip />
<el-table-column prop="allowIn" label="允许入库" :formatter="yesOrNoFormat" min-width="120px"
show-overflow-tooltip/>
<el-table-column prop="allowOut" label="允许出库" :formatter="yesOrNoFormat" min-width="120px"
show-overflow-tooltip/>
<el-table-column prop="allowMwl" label="允许装载机" :formatter="yesOrNoFormat" min-width="120px"
show-overflow-tooltip/>
<el-table-column prop="allowMg" label="允许平地机" :formatter="yesOrNoFormat" min-width="120px"
show-overflow-tooltip/>
<el-table-column prop="allowIn" label="允许入库" min-width="120px" show-overflow-tooltip />
<el-table-column prop="allowOut" label="允许出库" min-width="120px" show-overflow-tooltip />
<el-table-column prop="isLock" label="锁定" :formatter="isLockFormat" min-width="120px"
show-overflow-tooltip />
<el-table-column prop="standStatus" label="状态" :formatter="standStatusFormat" show-overflow-tooltip
@ -93,20 +83,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="12" :offset="0">
<el-form-item label="允许装载机" prop="allowMwl">
<el-select-v2 v-model="standFormEntity.allowMwl" placeholder="是否允许装载机"
:options="yesOrNoOptions" :disabled="standFormEntity.standType != 2"></el-select-v2>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="允许平地机" prop="allowMg">
<el-select-v2 v-model="standFormEntity.allowMg" placeholder="是否允许平地机"
:options="yesOrNoOptions" :disabled="standFormEntity.standType != 2"></el-select-v2>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="12" :offset="0">
<el-form-item label="上次使用时间" prop="lastUseTime">
@ -166,8 +142,6 @@ export default {
total: 0,
standIdQuery: '',
standTypeQuery: -99,
allowMwlQuery: -99,
allowMgQuery: -99,
loading: true,
dialogVisible: false,
standId: '',
@ -203,20 +177,6 @@ export default {
label: '已锁定'
},
],
yesOrNoOptions: [
{
value: -99,
label: '全部'
},
{
value: 0,
label: '否'
},
{
value: 1,
label: '是'
},
],
standStatusOptions: [
{
value: 0,
@ -249,9 +209,7 @@ export default {
pageNo: this.currentPage,
pageSize: this.pageSize,
standId: this.standIdQuery.trim(),
standType: this.standTypeQuery === -99 ? null : this.standTypeQuery,
allowMwl: this.allowMwlQuery === -99 ? null : this.allowMwlQuery,
allowMg: this.allowMgQuery === -99 ? null : this.allowMgQuery,
standType: this.standTypeQuery == -99 ? null : this.standTypeQuery,
userName: store.getters.getUserName
}
getStandsByPage(request).then(res => {
@ -296,16 +254,6 @@ export default {
return '未知'
}
},
yesOrNoFormat: (row, column, cellValue, index) => {
switch (cellValue) {
case 0:
return '否'
case 1:
return '是'
default:
return '未知'
}
},
standStatusFormat: (row, column, cellValue, index) => {
switch (cellValue) {
case 0:
@ -340,19 +288,14 @@ export default {
standStatus: row.standStatus,
lastUseTime: row.lastUseTime,
pickVehicleCount: row.pickVehicleCount,
allowNoPlan: row.allowNoPlan,
allowMwl: row.allowMwl,
allowMg: row.allowMg,
allowNoPlan: row.allowNoPlan
}
this.dialogVisible = true
},
submitInfo(formData) {
if (formData.standType == 3 && formData.allowNoPlan == 1) {
if (formData.standType == 3) {
return errorBox('堆垛机不允许非计划。')
}
if (formData.allowMwl == -99 || formData.allowMg == -99) {
return errorBox('必须确定是否允许装载机与是否允许平地机。')
}
const params = {
standId: formData.standId,
standType: formData.standType,
@ -361,8 +304,6 @@ export default {
lastUseTime: formData.lastUseTime,
pickVehicleCount: formData.pickVehicleCount,
allowNoPlan: formData.allowNoPlan,
allowMwl: formData.allowMwl,
allowMg: formData.allowMg,
userName: store.getters.getUserName
}
updateStandInfo(params).then(res => {