Browse Source

修复测试文档中供应链管理--物料管理、销售退货单的问题

master
yunuo970428 3 years ago
parent
commit
7d338c9ed0
  1. 19
      anrui-scm/anrui-scm-ui/src/views/anruiscm/scmmaterial/scmmaterial.vue
  2. 248
      anrui-scm/anrui-scm-ui/src/views/anruiscm/scmreturn/scmreturnAdd.vue

19
anrui-scm/anrui-scm-ui/src/views/anruiscm/scmmaterial/scmmaterial.vue

@ -3,8 +3,7 @@
<div v-show="viewState == 1">
<button-bar ref="btnbar" view-title="物料管理" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
</el-button>
<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-row>
@ -21,7 +20,7 @@
<el-input v-model="queryParams.params.model" placeholder="请输入规格型号" clearable/>
</el-form-item>
<el-form-item label="物料分组">
<el-select v-model="queryParams.params.mGroup" @change='changemGroup' filterable placeholder="请选择" style="width:200px">
<el-select v-model="queryParams.params.mGroup" @change='changemGroup' clearable filterable placeholder="请选择" style="width:200px">
<el-option v-for="item in mGroup_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
@ -29,25 +28,25 @@
</el-row>
<el-row>
<el-form-item label="数据状态">
<el-select v-model="queryParams.params.state" @change='changestate' filterable placeholder="请选择" style="width:200px">
<el-select v-model="queryParams.params.state" @change='changestate' clearable filterable placeholder="请选择" style="width:200px">
<el-option label="已审核" value="0"/>
<el-option label="未审核" value="1"/>
</el-select>
</el-form-item>
<el-form-item label="禁用状态">
<el-select v-model="queryParams.params.isEnable" @change='changeisEnable' filterable placeholder="请选择" style="width:200px">
<el-select v-model="queryParams.params.isEnable" @change='changeisEnable' clearable filterable placeholder="请选择" style="width:200px">
<el-option label="可用" value="0"/>
<el-option label="不可用" value="1"/>
</el-select>
</el-form-item>
<el-form-item label="物料属性">
<el-select v-model="queryParams.params.mAttribute" @change='changemAttribute' filterable placeholder="请选择" style="width:200px">
<el-select v-model="queryParams.params.mAttribute" @change='changemAttribute' clearable filterable placeholder="请选择" style="width:200px">
<el-option v-for="item in mAttribute_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="存货类别">
<el-select v-model="queryParams.params.inventoryType" @change='changeinventoryType' filterable placeholder="请选择" style="width:200px">
<el-select v-model="queryParams.params.inventoryType" @change='changeinventoryType' clearable filterable placeholder="请选择" style="width:200px">
<el-option v-for="item in inventoryType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
@ -58,18 +57,18 @@
<el-input v-model="queryParams.params.storageLocation" placeholder="请输入物料简称" clearable/>
</el-form-item>
<el-form-item label="生产厂家">
<el-select v-model="queryParams.params.manufacturerSid" @change='changemAttribute' filterable placeholder="请选择" style="width:200px">
<el-select v-model="queryParams.params.manufacturerSid" @change='changemAttribute' clearable filterable placeholder="请选择" style="width:200px">
<el-option v-for="item in manufacturer_list" :key="item.sid" :label="item.manufacturerName" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="入库时间">
<div class="block" style="float: left;">
<el-date-picker v-model="queryParams.params.warehousingStartTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/>
<el-date-picker v-model="queryParams.params.warehousingStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</div>
<div style="float: left;"></div>
<div class="block" style="float: left;">
<el-date-picker v-model="queryParams.params.warehousingEndTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/>
<el-date-picker v-model="queryParams.params.warehousingEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</div>
</el-form-item>
</el-row>

248
anrui-scm/anrui-scm-ui/src/views/anruiscm/scmreturn/scmreturnAdd.vue

@ -6,8 +6,7 @@
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled"
@click="dialogStatus === 'add' ? saveAdd() : saveEdit()">保存
<el-button type="primary" size="small" :disabled="submitdisabled" @click="dialogStatus === 'add' ? saveAdd() : saveEdit()">保存
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled">提交</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled">打印</el-button>
@ -57,8 +56,7 @@
<el-col :span="5">
<el-form-item prop="billTypeValue">
<el-select v-model="formobj.billType" @change='changebillType' filterable placeholder="请选择" clearable>
<el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey">
<el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
@ -68,8 +66,7 @@
</el-col>
<el-col :span="5">
<el-form-item prop="returnCustomer">
<el-select v-model="formobj.returnCustomer" @change="changereturnCustomer" class="addinputw" filterable
placeholder="请选择" clearable>
<el-select v-model="formobj.returnCustomer" @change="changereturnCustomer" class="addinputw" filterable placeholder="请选择" clearable>
<el-option v-for="item in returnCustomer_list" :key="item.sid" :label="item.name" :value="item.sid">
</el-option>
</el-select>
@ -80,16 +77,9 @@
</el-col>
<el-col :span="5">
<el-form-item prop="stockOrgName">
<el-select v-model="formobj.stockOrgName" @change="stockOrgNameChange"
placeholder="请选择" class="addinputw" clearable>
<el-option v-for="item in stockOrgName_list" :key="item.sid" :label="item.name"
:value="item.name" clearable></el-option>
<el-select v-model="formobj.stockOrgName" @change="stockOrgNameChange" placeholder="请选择" class="addinputw" clearable>
<el-option v-for="item in stockOrgName_list" :key="item.sid" :label="item.name" :value="item.name" clearable></el-option>
</el-select>
<!-- <el-cascader :key="refreshItem" v-model="stockOrgName_list" class="addinputw" @change="stockOrgNameChange"-->
<!-- :options="orgOptions" :props="orgProps" clearable/>-->
<!-- <el-cascader :key="refreshItem" v-model="stockOrgName_list" style="height:20px"-->
<!-- @change="stockOrgNameChange" :options="options" :props="props" clearable/>-->
</el-form-item>
</el-col>
</el-row>
@ -107,8 +97,7 @@
</el-col>
<el-col :span="5">
<el-form-item prop="stockDepName">
<el-cascader :key="refreshItem" v-model="stockDepName_list" style="height:20px"
@change="stockDepNameChange" :options="options" :props="props" clearable/>
<el-cascader :key="refreshItem" v-model="stockDepName_list" style="height:20px" @change="stockDepNameChange" :options="options" :props="props" clearable/>
</el-form-item>
</el-col>
<el-col :span="3" class="el-form-item-right">
@ -116,8 +105,7 @@
</el-col>
<el-col :span="5">
<el-form-item prop="date">
<el-date-picker value-format="yyyy-MM-dd" v-model="formobj.date" clearable type="date"
placeholder="开始日期"/>
<el-date-picker value-format="yyyy-MM-dd" v-model="formobj.date" clearable type="date" placeholder="开始日期"/>
</el-form-item>
</el-col>
</el-row>
@ -135,10 +123,8 @@
</el-col>
<el-col :span="5">
<el-form-item prop="projectCategory">
<el-select v-model="formobj.projectCategory" @change='changeprojectCategory' filterable placeholder="请选择"
clearable>
<el-option v-for="item in projectCategory_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey">
<el-select v-model="formobj.projectCategory" @change='changeprojectCategory' filterable placeholder="请选择" clearable>
<el-option v-for="item in projectCategory_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
@ -148,10 +134,8 @@
</el-col>
<el-col :span="5">
<el-form-item prop="billStateValue">
<el-select v-model="formobj.billStateValue" @change='changebillState' class="addinputw" filterable
placeholder="请选择" clearable>
<el-option v-for="item in billState_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey">
<el-select v-model="formobj.billStateValue" @change='changebillState' class="addinputw" filterable placeholder="请选择" clearable>
<el-option v-for="item in billState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
@ -179,15 +163,9 @@
</el-col>
<el-col :span="5">
<el-form-item prop="salesOrgName">
<el-select v-model="formobj.salesOrgName" @change="salesOrgNameChange"
placeholder="请选择" class="addinputw" clearable>
<el-option v-for="item in salesOrgName_list" :key="item.sid" :label="item.name"
:value="item.name" clearable></el-option>
<el-select v-model="formobj.salesOrgName" @change="salesOrgNameChange" placeholder="请选择" class="addinputw" clearable>
<el-option v-for="item in salesOrgName_list" :key="item.sid" :label="item.name" :value="item.name" clearable></el-option>
</el-select>
<!-- <el-cascader :key="refreshItem" v-model="salesOrgName_list" class="addinputw" @change="salesOrgNameChange"-->
<!-- :options="orgOptions" :props="orgProps" clearable/>-->
<!-- <el-cascader :key="refreshItem" v-model="salesOrgName_list" style="height:20px"-->
<!-- @change="salesOrgNameChange" :options="options" :props="props" clearable/>-->
</el-form-item>
</el-col>
</el-row>
@ -216,22 +194,18 @@
</el-table-column>
<el-table-column label="物料编码" header-align="center" width="175">
<template slot-scope="scope">
<el-select v-model="scope.row.mNum" placeholder="请选择" style="width: 120px;"
@change="changeMnum(scope.row,this)" clearable>
<el-option v-for="item in tablemNum_list" :key="item.sid" :label="item.mNum"
:value="item.mNum"></el-option>
<el-select v-model="scope.row.mNum" placeholder="请选择" style="width: 120px;" @change="changeMnum(scope.row,this)" clearable>
<el-option v-for="item in tablemNum_list" :key="item.sid" :label="item.mNum" :value="item.mNum"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="物料名称" header-align="center" width="150">
<template slot-scope="scope">
<!-- <el-input v-model="scope.row.mName" placeholder="" class="addinputw" clearable />-->
<span>{{ scope.row.mName }}</span>
</template>
</el-table-column>
<el-table-column label="规格型号" header-align="center" width="150">
<template slot-scope="scope">
<!-- <el-input v-model="scope.row.model" placeholder="" class="addinputw" clearable />-->
<span>{{ scope.row.model }}</span>
</template>
</el-table-column>
@ -272,10 +246,8 @@
</el-table-column>
<el-table-column label="仓库" header-align="center" width="175">
<template slot-scope="scope">
<el-select v-model="scope.row.warehouse" @change="changeWarehouse(scope.row,this)"
placeholder="请选择" class="addinputw" clearable>
<el-option v-for="item in warehouse_list" :key="item.sid" :label="item.warehouseName"
:value="item.warehouseName" clearable></el-option>
<el-select v-model="scope.row.warehouse" @change="changeWarehouse(scope.row,this)" placeholder="请选择" class="addinputw" clearable>
<el-option v-for="item in warehouse_list" :key="item.sid" :label="item.warehouseName" :value="item.warehouseName" clearable></el-option>
</el-select>
</template>
</el-table-column>
@ -287,17 +259,14 @@
<el-table-column label="库存状态" header-align="center" width="125">
<template slot-scope="scope">
<el-select v-model="scope.row.invenState" style="width:100px" filterable placeholder="请选择" clearable>
<el-option v-for="item in tableInvenState_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictValue">
<el-option v-for="item in tableInvenState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="退货日期" header-align="center" width="245">
<template slot-scope="scope">
<!-- <el-input v-model="scope.row.returnGoodsDate" placeholder="" class="addinputw" clearable /> -->
<el-date-picker value-format="yyyy-MM-dd" v-model="scope.row.returnGoodsDate" clearable type="date"
placeholder="开始日期"/>
<el-date-picker value-format="yyyy-MM-dd" v-model="scope.row.returnGoodsDate" clearable type="date" placeholder="开始日期"/>
</template>
</el-table-column>
<el-table-column label="计划跟踪号" header-align="center" width="150">
@ -307,7 +276,6 @@
</el-table-column>
<el-table-column label="备注" header-align="center" width="150">
<template slot-scope="scope">
<!-- <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>-->
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
@ -318,10 +286,8 @@
</el-table-column>
<el-table-column label="车辆类型" header-align="center" width="125">
<template slot-scope="scope">
<el-select v-model="scope.row.vehicleTypeValue" @change="tableChangeVehicleTypeValue(scope.row)"
style="width:100px" filterable placeholder="请选择" clearable>
<el-option v-for="item in tablevehicleTypeValue_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictValue">
<el-select v-model="scope.row.vehicleTypeValue" @change="tableChangeVehicleTypeValue(scope.row)" style="width:100px" filterable placeholder="请选择" clearable>
<el-option v-for="item in tablevehicleTypeValue_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
</el-option>
</el-select>
</template>
@ -429,25 +395,27 @@
},
zuzhi0(data) {
data.forEach((e) => {
if (e.children.length != 0) {
if (e.children) {
if (e.children.length !== 0) {
this.zuzhi0(e.children)
} else {
delete e.children
this.dataArr.push(e)
return
}
}
})
},
// ---
findOrgId(id, options) {
for (var i = 0; i < options.length; i++) {
if (id == options[i].sid) {
if (id === options[i].sid) {
this.select_temp_Name = options[i].name //
this.select_temp_Sid = options[i].sid
return true
} else {
//
if (options[i].children !== undefined) {
if (options[i].children !== undefined && options[i].children !== null) {
//
if (this.findOrgId(id, options[i].children)) {
return true
@ -483,7 +451,6 @@
console.log('选中名称:' + this.formobj.stockDepName)
},
// ()
getOrg() {
req.getOrg().then((res) => {
@ -497,8 +464,7 @@
console.log('触发下拉框按钮', value)
let bb = {}
this.stockOrgName_list.forEach((e) => {
// eslint-disable-next-line eqeqeq
if (e.name == value) {
if (e.name === value) {
bb = {
name: e.name,
key: e.id,
@ -514,8 +480,7 @@
console.log('触发下拉框按钮', value)
let bb = {}
this.salesOrgName_list.forEach((e) => {
// eslint-disable-next-line eqeqeq
if (e.name == value) {
if (e.name === value) {
bb = {
name: e.name,
key: e.id,
@ -527,88 +492,6 @@
this.formobj.salesOrgSid = bb.sid
console.log('name', this.formobj.salesOrgName, this.formobj.salesOrgSid)
},
// org0(data) {
// data.forEach((e) => {
// if (e.children.length != 0) {
// this.org0(e.children)
// } else {
// delete e.children
// this.orgArr.push(e)
// return
// }
// })
// },
// stockOrgNameChange(e) {
// console.log('' + JSON.stringify(e))
// var result = ''
// var result_Sid = ''
// if (e.length > 0) {
// //
// e.forEach((item) => {
// var last_id = item[item.length - 1]
// //
// this.select_temp_Name = '' // ()
// this.select_temp_Sid = '' //(Sid)
// this.gainOrgId(last_id, this.orgOptions)
// result = result + this.select_temp_Name + ','
// result_Sid = result_Sid + this.select_temp_Sid + ','
// })
// }
// if (result !== '') {
// result = result.substring(0, result.length - 1)
// }
// if (result_Sid !== '') {
// result_Sid = result_Sid.substring(0, result_Sid.length - 1)
// }
// this.formobj.stockOrgName = result
// this.formobj.stockOrgSid = result_Sid
// console.log('' + this.formobj.stockOrgName)
// },
// salesOrgNameChange(e) {
// console.log('' + JSON.stringify(e))
// var result = ''
// var result_Sid = ''
// if (e.length > 0) {
// //
// e.forEach((item) => {
// var last_id = item[item.length - 1]
// //
// this.select_temp_Name = '' // ()
// this.select_temp_Sid = '' //(Sid)
// this.gainOrgId(last_id, this.orgOptions)
// result = result + this.select_temp_Name + ','
// result_Sid = result_Sid + this.select_temp_Sid + ','
// })
// }
// if (result !== '') {
// result = result.substring(0, result.length - 1)
// }
// if (result_Sid !== '') {
// result_Sid = result_Sid.substring(0, result_Sid.length - 1)
// }
// this.formobj.salesOrgName = result
// this.formobj.salesOrgSid = result_Sid
// console.log('' + this.formobj.salesOrgName)
// },
// // ---
// gainOrgId(id, orgOptions) {
// for (var i = 0; i < orgOptions.length; i++) {
// if (orgOptions[i].sid) {
// this.select_temp_Name = orgOptions[i].name //
// this.select_temp_Sid = orgOptions[i].sid
// return true
// } else {
// //
// if (orgOptions[i].children !== undefined) {
// //
// if (this.gainOrgId(id, orgOptions[i].children)) {
// return true
// }
// }
// }
// }
// },
//
billNoAndStaffName() {
req.billNoAndStaffName({userSid: window.sessionStorage.getItem('userSid')}).then((response) => {
@ -630,7 +513,7 @@
changebillType(value) {
let bb = null
this.billType_list.forEach((e) => {
if (e.dictKey == value) {
if (e.dictKey === value) {
bb = {
name: e.dictValue,
value: e.dictKey
@ -651,7 +534,7 @@
changereturnCustomer(value) {
let bb = null
this.returnCustomer_list.forEach((e) => {
if (e.sid == value) {
if (e.sid === value) {
bb = {
name: e.name,
value: e.sid
@ -672,7 +555,7 @@
changebillState(value) {
let bb = null
this.billState_list.forEach((e) => {
if (e.dictKey == value) {
if (e.dictKey === value) {
bb = {
name: e.dictValue,
value: e.dictKey
@ -693,7 +576,7 @@
changeprojectCategory(value) {
let bb = null
this.projectCategory_list.forEach((e) => {
if (e.dictKey == value) {
if (e.dictKey === value) {
bb = {
name: e.dictValue,
value: e.dictKey
@ -851,7 +734,7 @@
this.formobj.userSid = window.sessionStorage.getItem('userSid'),
this.formobj.list = [],
this.$refs['form_obj'].resetFields()
this.stockOrgName_list = [], //
this.stockOrgName_list = [] //
this.stockDepName_list = [], //
this.salesOrgName_list = [],
this.tableData = [],
@ -873,7 +756,6 @@
this.dialogStatus = 'edit'
this.viewTitle = '【编辑】销售退货单'
this.formobj.sid = row.sid
const _this = this
console.log(row.sid)
req.fetchBySid(row.sid).then(resp => {
const vdata = resp.data.data
@ -934,22 +816,22 @@
},
saveEdit(row) {
const _this = this
// Start
var stockOrg_Sid = ''
if (this.stockOrgName_list.length > 0) {
this.stockOrgName_list.forEach((item) => {
var last_id = item[item.length - 1]
this.select_temp_Sid = '' //(Sid)
this.findOrgId(last_id, this.options)
stockOrg_Sid = stockOrg_Sid + this.select_temp_Sid + ','
})
}
if (stockOrg_Sid !== '') {
stockOrg_Sid = stockOrg_Sid.substring(0, stockOrg_Sid.length - 1)
}
this.formobj.stockOrgSid = stockOrg_Sid
console.log('重新赋值后的组织结构', this.formobj.stockOrgSid)
//End
// // Start
// var stockOrg_Sid = ''
// if (this.stockOrgName_list.length > 0) {
// this.stockOrgName_list.forEach((item) => {
// var last_id = item[item.length - 1]
// this.select_temp_Sid = '' // (Sid)
// this.findOrgId(last_id, this.options)
// stockOrg_Sid = stockOrg_Sid + this.select_temp_Sid + ','
// })
// }
// if (stockOrg_Sid !== '') {
// stockOrg_Sid = stockOrg_Sid.substring(0, stockOrg_Sid.length - 1)
// }
// this.formobj.stockOrgSid = stockOrg_Sid
// console.log('', this.formobj.stockOrgSid)
// // End
// Start
var stockDep_Sid = ''
@ -968,22 +850,22 @@
console.log('重新赋值后的组织结构', this.formobj.stockDepSid)
// End
// Start
var salesOrg_Sid = ''
if (this.salesOrgName_list.length > 0) {
this.salesOrgName_list.forEach((item) => {
var last_id = item[item.length - 1]
this.select_temp_Sid = '' //(Sid)
this.findOrgId(last_id, this.options)
salesOrg_Sid = salesOrg_Sid + this.select_temp_Sid + ','
})
}
if (salesOrg_Sid !== '') {
salesOrg_Sid = salesOrg_Sid.substring(0, salesOrg_Sid.length - 1)
}
this.formobj.salesOrgSid = salesOrg_Sid
console.log('重新赋值后的组织结构', this.formobj.salesOrgSid)
//End
// // Start
// var salesOrg_Sid = ''
// if (this.salesOrgName_list.length > 0) {
// this.salesOrgName_list.forEach((item) => {
// var last_id = item[item.length - 1]
// this.select_temp_Sid = '' // (Sid)
// this.findOrgId(last_id, this.options)
// salesOrg_Sid = salesOrg_Sid + this.select_temp_Sid + ','
// })
// }
// if (salesOrg_Sid !== '') {
// salesOrg_Sid = salesOrg_Sid.substring(0, salesOrg_Sid.length - 1)
// }
// this.formobj.salesOrgSid = salesOrg_Sid
// console.log('', this.formobj.salesOrgSid)
// // End
this.formobj.list = this.tableData
console.log(this.formobj)
this.$refs['form_obj'].validate(valid => {

Loading…
Cancel
Save