xins
/
HwJyHbMes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://1.13.177.47:3000/xins/HwJyHbMes

Browse Source
master
yinq 2 weeks ago
parent a71d1c013a 0c65820070
commit 2e77fb0862
6 changed files with 78 additions and 66 deletions
Show Stats Download Patch File Download Diff File

3
hw-ui/src/layout/components/Navbar.vue
Unescape Escape View File

@ -81,6 +81,7 @@
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="路由地址" align="center" prop="routerAddress" />
<el-table-column align="center" class-name="small-padding fixed-width" label="操作" width="100"> <el-table-column align="center" class-name="small-padding fixed-width" label="操作" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -208,7 +209,7 @@ export default {
/** 跳转处理 */ /** 跳转处理 */
jumpProcessing(row) { jumpProcessing(row) {
let params = {}; let params = {};
if (row.routerAddressDetail != null){ if (row.routerAddressDetail != null && row.routerAddressDetail !==''){
params = JSON.parse(row.routerAddressDetail) params = JSON.parse(row.routerAddressDetail)
} }

19
hw-ui/src/views/board/common/applyRawOutstock.vue
Unescape Escape View File

@ -42,8 +42,8 @@
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="searchMaterial('1')">BOM内物料搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="searchBomMaterial">BOM内物料搜索</el-button>
<el-button type="warning" icon="el-icon-search" size="mini" @click="searchMaterial('0')">非BOM内物料搜索</el-button> <el-button type="warning" icon="el-icon-search" size="mini" @click="searchNoneBomMaterial()">非BOM内物料搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -210,6 +210,7 @@ export default {
YES: '1',//是 YES: '1',//是
}, },
wmsRawOutstockDetailList:[], wmsRawOutstockDetailList:[],
bomFlag:undefined,
}; };
}, },
created() { created() {
@ -280,8 +281,18 @@ export default {
this.searchMaterial(); this.searchMaterial();
}, },
searchBomMaterial(){
this.bomFlag = "1";
this.searchMaterial()
},
searchNoneBomMaterial(){
this.bomFlag = "0";
this.searchMaterial();
},
// 物料搜索 // 物料搜索
searchMaterial(bomFlag) { searchMaterial() {
this.loading = true; this.loading = true;
if (this.form.warehouseId === null || this.form.warehouseId === undefined if (this.form.warehouseId === null || this.form.warehouseId === undefined
|| this.form.warehouseId === "") { || this.form.warehouseId === "") {
@ -293,7 +304,7 @@ export default {
this.queryParams.planDetailCode = this.form.planDetailCode; this.queryParams.planDetailCode = this.form.planDetailCode;
this.queryParams.productId = this.form.productId; this.queryParams.productId = this.form.productId;
this.queryParams.materialBomId = this.form.materialBomId; this.queryParams.materialBomId = this.form.materialBomId;
this.queryParams.accessoriesFlag = bomFlag; this.queryParams.accessoriesFlag = this.bomFlag;
getStockTotal(this.queryParams).then(e => { getStockTotal(this.queryParams).then(e => {
this.total = e.total; this.total = e.total;
// e.rows.forEach(ee =>{ // e.rows.forEach(ee =>{

2
hw-ui/src/views/mes/saleOrder/index.vue
Unescape Escape View File

@ -783,7 +783,7 @@ export default {
/** 导入按钮操作 */ /** 导入按钮操作 */
handleImport() { handleImport() {
this.upload.title = "提资单导入"; this.upload.title = "销售订单导入";
this.upload.open = true; this.upload.open = true;
this.submitLoading = false; this.submitLoading = false;
}, },

16
hw-ui/src/views/system/config/index.vue
Unescape Escape View File

@ -47,7 +47,7 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!--el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
plain plain
@ -56,7 +56,7 @@
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:config:add']" v-hasPermi="['system:config:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
@ -68,7 +68,7 @@
v-hasPermi="['system:config:edit']" v-hasPermi="['system:config:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!--el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"
plain plain
@ -78,7 +78,7 @@
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:config:remove']" v-hasPermi="['system:config:remove']"
>删除</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"
@ -128,13 +128,13 @@
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:config:edit']" v-hasPermi="['system:config:edit']"
>修改</el-button> >修改</el-button>
<el-button <!--el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:config:remove']" v-hasPermi="['system:config:remove']"
>删除</el-button> >删除</el-button-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -154,13 +154,13 @@
<el-input v-model="form.configName" placeholder="请输入参数名称" /> <el-input v-model="form.configName" placeholder="请输入参数名称" />
</el-form-item> </el-form-item>
<el-form-item label="参数键名" prop="configKey"> <el-form-item label="参数键名" prop="configKey">
<el-input v-model="form.configKey" placeholder="请输入参数键名" /> <el-input v-model="form.configKey" placeholder="请输入参数键名" disabled/>
</el-form-item> </el-form-item>
<el-form-item label="参数键值" prop="configValue"> <el-form-item label="参数键值" prop="configValue">
<el-input v-model="form.configValue" placeholder="请输入参数键值" /> <el-input v-model="form.configValue" placeholder="请输入参数键值" />
</el-form-item> </el-form-item>
<el-form-item label="系统内置" prop="configType"> <el-form-item label="系统内置" prop="configType">
<el-radio-group v-model="form.configType"> <el-radio-group v-model="form.configType" disabled>
<el-radio <el-radio
v-for="dict in dict.type.sys_yes_no" v-for="dict in dict.type.sys_yes_no"
:key="dict.value" :key="dict.value"

48
hw-ui/src/views/system/dict/data.vue
Unescape Escape View File

@ -36,16 +36,16 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
plain <!-- plain-->
icon="el-icon-plus" <!-- icon="el-icon-plus"-->
size="mini" <!-- size="mini"-->
@click="handleAdd" <!-- @click="handleAdd"-->
v-hasPermi="['system:dict:add']" <!-- v-hasPermi="['system:dict:add']"-->
>新增</el-button> <!-- >新增</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
@ -57,17 +57,17 @@
v-hasPermi="['system:dict:edit']" v-hasPermi="['system:dict:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="danger" <!-- type="danger"-->
plain <!-- plain-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
size="mini" <!-- size="mini"-->
:disabled="multiple" <!-- :disabled="multiple"-->
@click="handleDelete" <!-- @click="handleDelete"-->
v-hasPermi="['system:dict:remove']" <!-- v-hasPermi="['system:dict:remove']"-->
>删除</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"
@ -112,7 +112,7 @@
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <!--el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -129,7 +129,7 @@
v-hasPermi="['system:dict:remove']" v-hasPermi="['system:dict:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column-->
</el-table> </el-table>
<pagination <pagination
@ -150,7 +150,7 @@
<el-input v-model="form.dictLabel" placeholder="请输入数据标签" /> <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
</el-form-item> </el-form-item>
<el-form-item label="数据键值" prop="dictValue"> <el-form-item label="数据键值" prop="dictValue">
<el-input v-model="form.dictValue" placeholder="请输入数据键值" /> <el-input v-model="form.dictValue" placeholder="请输入数据键值" disabled/>
</el-form-item> </el-form-item>
<el-form-item label="样式属性" prop="cssClass"> <el-form-item label="样式属性" prop="cssClass">
<el-input v-model="form.cssClass" placeholder="请输入样式属性" /> <el-input v-model="form.cssClass" placeholder="请输入样式属性" />

50
hw-ui/src/views/system/dict/index.vue
Unescape Escape View File

@ -52,16 +52,16 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
plain <!-- plain-->
icon="el-icon-plus" <!-- icon="el-icon-plus"-->
size="mini" <!-- size="mini"-->
@click="handleAdd" <!-- @click="handleAdd"-->
v-hasPermi="['system:dict:add']" <!-- v-hasPermi="['system:dict:add']"-->
>新增</el-button> <!-- >新增</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
@ -73,17 +73,17 @@
v-hasPermi="['system:dict:edit']" v-hasPermi="['system:dict:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="danger" <!-- type="danger"-->
plain <!-- plain-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
size="mini" <!-- size="mini"-->
:disabled="multiple" <!-- :disabled="multiple"-->
@click="handleDelete" <!-- @click="handleDelete"-->
v-hasPermi="['system:dict:remove']" <!-- v-hasPermi="['system:dict:remove']"-->
>删除</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"
@ -129,7 +129,7 @@
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <!--el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -146,7 +146,7 @@
v-hasPermi="['system:dict:remove']" v-hasPermi="['system:dict:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column-->
</el-table> </el-table>
<pagination <pagination
@ -164,10 +164,10 @@
<el-input v-model="form.dictName" placeholder="请输入字典名称" /> <el-input v-model="form.dictName" placeholder="请输入字典名称" />
</el-form-item> </el-form-item>
<el-form-item label="字典类型" prop="dictType"> <el-form-item label="字典类型" prop="dictType">
<el-input v-model="form.dictType" placeholder="请输入字典类型" /> <el-input v-model="form.dictType" placeholder="请输入字典类型" disabled/>
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status" disabled>
<el-radio <el-radio
v-for="dict in dict.type.sys_normal_disable" v-for="dict in dict.type.sys_normal_disable"
:key="dict.value" :key="dict.value"

Write Preview
Loading…
Cancel
Save