Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 10 months ago
parent
commit
cdb5d8261c
  1. 8
      yxt-as-ui/src/api/warehouse/warehouse.js
  2. 20
      yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
  3. 2
      yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue
  4. 4
      yxt-as-ui/src/views/maintenance/maintenanceOutbound/relation/chooseproducts.vue
  5. 91
      yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue
  6. 11
      yxt-as-ui/src/views/warehouse/goodsShelves/index.vue
  7. 2
      yxt-as-ui/src/views/warehouse/warehouse/index.vue
  8. 77
      yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue
  9. 17
      yxt-as-ui/src/views/warehouse/warehouse/warehouseInfo.vue
  10. 16
      yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue

8
yxt-as-ui/src/api/warehouse/warehouse.js

@ -67,4 +67,12 @@ export default {
})
},
// 按角色(配件主管、配件计划员、仓库管理员)获取人员
selMangerByRole: function(params) {
return request({
url: '/wms/apiadmin/base/wmswarehouseinfo/selMangerByRole',
method: 'get',
params: params,
})
},
}

20
yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue

@ -74,8 +74,13 @@
<el-form-item prop="price"><span class="addinputInfo">{{ calculatePrice }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>考核工时</div>
<el-form-item prop="examineHourPrice"><el-input class="addinputInfo addinputw" @keyup.native="formobj.examineHourPrice = getNumber(formobj.examineHourPrice, 2)" v-model="formobj.examineHourPrice" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>工时提成</div>
<el-form-item prop="examineHourPrice">
<div class="addinputInfo" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<el-input style="width: 40%" @input="royaltiesRatioInput(formobj)" @keyup.native="formobj.examineHourPrice = getNumber(formobj.examineHourPrice, 2)" v-model="formobj.examineHourPrice" clearable placeholder="" />
<el-input style="width: 100px" @input="examineHourPriceInput(formobj)" @keyup.native="royaltiesRatio = getNumber(royaltiesRatio, 2)" v-model="royaltiesRatio" clearable placeholder="提成比例(%)" />
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
@ -129,6 +134,7 @@ export default {
goodsModel_list: [],
manufacturer_list: [],
subject_list: [],
royaltiesRatio: '', //
formobj: {
sid: '',
createBySid: '',
@ -224,6 +230,8 @@ export default {
req.fetchBySid(row.sid).then((res) => {
if (res.success) {
this.formobj = res.data
//
this.examineHourPriceInput(this.formobj)
}
})
},
@ -277,6 +285,14 @@ export default {
this.formobj.manufacturerSid = ''
}
},
// = /
royaltiesRatioInput(val) {
this.royaltiesRatio = Math.round((parseFloat(val.examineHourPrice !== '' ? val.examineHourPrice : '0') / parseFloat(val.price !== '' ? val.price : '0')) * 100) / 100
},
// = *
examineHourPriceInput(val) {
val.examineHourPrice = Math.round((parseFloat(val.price !== '' ? val.price : '0') * parseFloat(this.royaltiesRatio !== '' ? this.royaltiesRatio : '0')) * 100) / 100
},
saveOrUpdate() {
this.formobj.price = this.calculatePrice
this.$refs['form_obj'].validate((valid) => {

2
yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue

@ -57,7 +57,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.price }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">考核工时</div>
<div class="span-sty">工时提成</div>
<el-form-item><span class="addinputInfo">{{ formobj.examineHourPrice }}</span></el-form-item>
</el-col>
<el-col :span="8">

4
yxt-as-ui/src/views/maintenance/maintenanceOutbound/relation/chooseproducts.vue

@ -53,7 +53,7 @@
</el-table-column>
<el-table-column prop="billNo" label="工单编号" align="center" />
<el-table-column prop="billType" label="工单类型" align="center" />
<el-table-column prop="billType" label="是否外出" align="center" />
<!-- <el-table-column prop="billType" label="是否外出" align="center" /> -->
<el-table-column prop="customerName" label="客户名称" align="center" />
<el-table-column prop="mobile" label="联系电话" align="center" />
<el-table-column prop="vinNo" label="车架号" align="center" />
@ -192,7 +192,7 @@
}
},
toInfo(row){
toInfo(row) {
this.$emit('backData', row.sid)
},
//

91
yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue

@ -31,7 +31,7 @@
</el-form-item>
</el-col>
<el-col :span="16">
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 选择所属库区</div>
<el-form-item prop="locationName">
<el-select v-model="formobj.locationName" placeholder="请选择所属库区" class="addinputw addinputInfo"
@ -41,9 +41,18 @@
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">库位编码</div>
<el-form-item prop="rackCode">
<span class="addinputw addinputInfo">{{formobj.rackCode}}</span>
<!-- <el-input v-model="formobj.rackCode" placeholder="由系统自动生成。格式:排-架-层-位" :readonly="true"
class="addinputw addinputInfo" clearable oninput="this.value=this.value.replace(/[^\w_-]/g,'');" /> -->
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- <el-row>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 库位名称</div>
<el-form-item prop="rackName">
@ -58,7 +67,7 @@
oninput="this.value=this.value.replace(/[^\w_-]/g,'');" />
</el-form-item>
</el-col>
</el-row>
</el-row> -->
<el-row>
@ -121,7 +130,7 @@
formobj: {
sid: '',
rackName: '',
rackCode: '',
rackCode: '由系统自动生成。格式:排-架-层-位。',
warehouseName: '',
warehouseSid: '',
locationName: '',
@ -144,16 +153,6 @@
required: true,
message: '请选择所属库区',
trigger: 'change'
}],
rackName: [{
required: true,
message: '库位名称不能为空',
trigger: 'blur'
}],
rackCode: [{
required: true,
message: '库位编码不能为空',
trigger: 'blur'
}]
}
}
@ -208,70 +207,6 @@
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
// if (this.formobj.warehouseSid == '' || this.formobj.warehouseName == '') {
// this.$message({
// showClose: true,
// type: 'warning',
// message: ""
// })
// return
// }
// if (this.formobj.locationSid == '' || this.formobj.locationSid == '') {
// this.$message({
// showClose: true,
// type: 'warning',
// message: ""
// })
// return
// }
// if (this.formobj.rackName == '') {
// this.$message({
// showClose: true,
// type: 'warning',
// message: ""
// })
// return
// }
// if (this.formobj.rackCode == '') {
// this.$message({
// showClose: true,
// type: 'warning',
// message: ""
// })
// return
// }
var aaa = this.formobj.rackCode.split('-')
console.log('>>>>>>>>>saveOrUpdate', aaa)
if (aaa.length != 4) {
this.$message({
showClose: true,
type: 'warning',
message: '库位编码格式错误'
})
return
}
for (var i = 0; i < aaa.length; i++) {
if (aaa[i] == '') {
this.$message({
showClose: true,
type: 'warning',
message: '库位编码格式错误'
})
return
}
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
req.saveGoodsShelves(this.formobj)

11
yxt-as-ui/src/views/warehouse/goodsShelves/index.vue

@ -9,9 +9,9 @@
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="库位名称">
<!-- <el-form-item label="库位名称">
<el-input v-model="queryParams.params.name" placeholder="" clearable />
</el-form-item>
</el-form-item> -->
<el-form-item label="库位编码">
<el-input v-model="queryParams.params.code" placeholder="" clearable />
</el-form-item>
@ -59,10 +59,11 @@
inactive-value="2" @change="enableChange(scope.row.sid,scope.row.isEnable)" />
</template>
</el-table-column>
<el-table-column prop="rackName" label="库位名称" align="center" />
<el-table-column prop="rackCode" label="库位编码" align="center" />
<!-- <el-table-column prop="rackName" label="库位名称" align="center" /> -->
<el-table-column prop="warehouseName" label="所属仓库" align="center" />
<el-table-column prop="locationName" label="所属库区" align="center" />
<el-table-column prop="rackCode" label="库位编码" align="center" />
<el-table-column prop="remarks" label="备注" align="center" />
</el-table>
</div>
<!-- End 项目列表 -->
@ -172,7 +173,7 @@
},
getwarehouse() {
var parpams = {
orgPath:window.sessionStorage.getItem('defaultOrgPath'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
}
req2.getAllWarehouse(parpams).then(resp => {
console.log('>>>>>>>>>getAllWarehouse', resp)

2
yxt-as-ui/src/views/warehouse/warehouse/index.vue

@ -53,7 +53,7 @@
<el-table-column prop="warehouseName" label="仓库名称" align="center" />
<el-table-column prop="warehouseCode" label="仓库编码" align="center" />
<el-table-column prop="manager" label="仓库主管" align="center" />
<el-table-column prop="telephone" label="联系电话" align="center" />
<!-- <el-table-column prop="telephone" label="联系电话" align="center" /> -->
<el-table-column prop="squareMeter" label="占地面积" align="center" />
<el-table-column prop="address" label="仓库地址" align="center" />
<el-table-column prop="sortNo" label="排序" align="center" />

77
yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue

@ -20,10 +20,11 @@
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 仓库编码</div>
<div class="span-sty">仓库编码</div>
<el-form-item prop="warehouseCode">
<el-input v-model="formobj.warehouseCode" placeholder="仓库编码" class="addinputw addinputInfo" clearable
oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
<span class="addinputw addinputInfo">{{formobj.warehouseCode}}</span>
<!-- <el-input v-model="formobj.warehouseCode" placeholder="仓库编码" class="addinputw addinputInfo" clearable
oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" /> -->
</el-form-item>
</el-col>
@ -39,7 +40,7 @@
<el-row>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 仓库类型</div>
<div class="span-sty">仓库类型</div>
<el-form-item prop="warehouseTypeValue">
<el-select v-model="formobj.warehouseTypeValue" placeholder="请选择仓库类型" class="addinputw addinputInfo"
@change="selectWarehouseTypeChange">
@ -61,7 +62,15 @@
<el-col :span="8">
<div class="span-sty">仓库管理员</div>
<el-form-item>
<el-input v-model="formobj.manager" placeholder="仓库管理员" class="addinputw addinputInfo" clearable />
<el-form-item prop="manager">
<el-select v-model="formobj.manager" placeholder="请选择仓库管理员" class="addinputw addinputInfo"
@change="selectManager">
<el-option v-for="item in managerList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
</el-form-item>
<!-- <el-input v-model="formobj.manager" placeholder="仓库管理员" class="addinputw addinputInfo" clearable /> -->
</el-form-item>
</el-col>
@ -98,7 +107,7 @@
</el-row>
<el-row>
<!-- <el-row>
<el-col :span="8">
<div class="span-sty">联系人</div>
@ -122,7 +131,7 @@
</el-form-item>
</el-col>
</el-row>
</el-row> -->
<el-row>
@ -168,7 +177,8 @@
<script>
import req from '@/api/warehouse/warehouse.js'
import {
typeValues
typeValues,
getOrgSidByPath
} from '@/api/Common/dictcommons.js'
export default {
components: {},
@ -178,13 +188,14 @@
formobj: {
sid: '',
warehouseName: '',
warehouseCode: '',
warehouseCode: '由系统自动生成。',
warehouseTypeKey: '',
warehouseTypeValue: '',
contacts: "",
mob: "",
telephone: "",
manager: '',
managerSid: '',
longitude: '',
latitude: '',
usageStatus: "",
@ -199,22 +210,13 @@
userSid: window.sessionStorage.getItem('userSid'),
},
warehouseTypeList: [],
managerList: [],
rules: {
warehouseCode: [{
required: true,
message: '仓库编码不能为空',
trigger: 'blur'
}],
warehouseName: [{
required: true,
message: '仓库名称不能为空',
trigger: 'blur'
}],
warehouseTypeValue: [{
required: true,
message: '请选择仓库类型',
trigger: 'change'
}],
sortNo: [{
required: true,
message: '排序不能为空',
@ -225,15 +227,28 @@
message: '请选择使用状态',
trigger: 'change'
}],
manager: [{
required: true,
message: '请选择仓库管理员',
trigger: 'change'
}],
}
}
},
created() {
this.getDictValue()
},
methods: {
changeTheme(val) {
},
selectManager(val) {
const choose = this.managerList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseTypeChange', choose)
this.formobj.manager = choose[0].name
this.formobj.managerSid = choose[0].sid
},
getDictValue() {
@ -246,6 +261,26 @@
console.log('>>>>>>>>>typeValues', resp)
this.warehouseTypeList = resp.data
}).catch(() => {})
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
req.selMangerByRole({
createOrgSid: res.data
})
.then(resp => {
if (resp.success) {
this.managerList = resp.data
}
})
.catch(e => {})
}
})
},
selectWarehouseTypeChange(val) {
@ -306,12 +341,14 @@
this.$emit('doback')
},
showAdd() {
this.getDictValue()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
},
showEdit(row) {
this.getDictValue()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})

17
yxt-as-ui/src/views/warehouse/warehouse/warehouseInfo.vue

@ -34,7 +34,7 @@
</el-row>
<el-row >
<el-row>
<el-col :span="8">
<div class="span-sty">仓库类型</div>
@ -59,7 +59,7 @@
</el-row>
<el-row >
<el-row>
<el-col :span="24">
<div class="span-sty">仓库地址</div>
@ -70,7 +70,7 @@
</el-row>
<el-row >
<el-row>
<el-col :span="8">
<div class="span-sty">经度</div>
@ -88,7 +88,7 @@
</el-row>
<el-row >
<!-- <el-row >
<el-col :span="8">
<div class="span-sty">联系人</div>
@ -111,9 +111,9 @@
</el-form-item>
</el-col>
</el-row>
</el-row> -->
<el-row >
<el-row>
<el-col :span="8">
<div class="span-sty">排序</div>
@ -125,7 +125,8 @@
<el-col :span="16">
<div class="span-sty">使用状态</div>
<el-form-item>
<el-radio-group v-model="formobj.usageStatus" size="small" :disabled='true' class="addinputw addinputInfo">
<el-radio-group v-model="formobj.usageStatus" size="small" :disabled='true'
class="addinputw addinputInfo">
<el-radio :label="'1'">正常</el-radio>
<el-radio :label="'0'">停用</el-radio>
</el-radio-group>
@ -134,7 +135,7 @@
</el-row>
<el-row >
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>

16
yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue

@ -39,16 +39,17 @@
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 库区编码</div>
<div class="span-sty">库区编码</div>
<el-form-item prop="areaCode">
<el-input v-model="formobj.areaCode" placeholder="库区编码" class="addinputw addinputInfo" clearable
oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
<span class="addinputw addinputInfo">{{formobj.areaCode}}</span>
<!-- <el-input v-model="formobj.areaCode" placeholder="由系统自动生成" :readonly="true" class="addinputw addinputInfo"
clearable oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" /> -->
</el-form-item>
</el-col>
</el-row>
<el-row >
<el-row>
<el-col :span="8">
<div class="span-sty">库区容量</div>
@ -151,7 +152,7 @@
formobj: {
sid: '',
areaName: '',
areaCode: '',
areaCode: '由系统自动生成。',
volume: '',
unit: '',
remarks: '',
@ -179,11 +180,6 @@
message: '库区名称不能为空',
trigger: 'blur'
}],
areaCode: [{
required: true,
message: '库区编码不能为空',
trigger: 'blur'
}],
areaTypeName: [{
required: true,
message: '请选择库区类型',

Loading…
Cancel
Save