yxt_product
/
wms-ui-admin
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

完善入库预约

master
guoxing 10 months ago
parent
66159c8404
commit
501a5d2e56
15 changed files with 216 additions and 267 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      src/api/Common/dictcommons.js
  2. 82
      src/api/inStorage/deliveryNotice.js
  3. 30
      src/api/reports/inOutStorage.js
  4. 207
      src/views/baseInfo/supplier/supplier/supplierAdd.vue
  5. 7
      src/views/baseInfo/supplier/suppliertype/suppliertype.vue
  6. 6
      src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue
  7. 6
      src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue
  8. 6
      src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue
  9. 7
      src/views/baseInfo/warehouses/warehouseAreaType/warehouseAreaTypeAdd.vue
  10. 6
      src/views/goods/brands/brandsAdd.vue
  11. 6
      src/views/goods/category/categoryAdd.vue
  12. 6
      src/views/goods/factory/factoryAdd.vue
  13. 6
      src/views/goods/goods/goodsAdd.vue
  14. 6
      src/views/goods/unit/unitAdd.vue
  15. 81
      src/views/inStorage/deliveryNotice/index.vue

21
src/api/Common/dictcommons.js
View File

@ -163,7 +163,7 @@ export function chooseproducts(params) {
// 查询所有仓库 // 查询所有仓库
export function getWarehouses(params) { export function getWarehouses(params) {
return request({ return request({
url: '/wms/apiadmin/base/wmswarehouseinfo/listAll', url: '/wms/apiadmin/warehouseinfo/listAll',
method: 'post', method: 'post',
data: params, data: params,
headers: { headers: {
@ -173,10 +173,23 @@ export function getWarehouses(params) {
} }
// 根据仓库查询库位 // 根据仓库查询库区
export function getWarehouseareas(data) { export function getWarehouseareas(data) {
return request({ return request({
url: '/wms/apiadmin/base/wmswarehousearea/selectAll', url: '/wms/apiadmin/warehousearea/selectAll',
method: 'get',
params: data,
headers: {
'Content-Type': 'application/json'
}
})
}
// 根据仓库查询库位
export function getWarehouserack(data) {
return request({
url: '/wms/apiadmin/warehouserack/selectAll',
method: 'get', method: 'get',
params: data, params: data,
headers: { headers: {
@ -189,7 +202,7 @@ export function getWarehouseareas(data) {
// 查询所有库位 // 查询所有库位
export function getWarehouseAacks(data) { export function getWarehouseAacks(data) {
return request({ return request({
url: '/wms/apiadmin/base/warehouserack/selectAll', url: '/wms/apiadmin/warehouserack/listAll',
method: 'get', method: 'get',
params: data, params: data,
headers: { headers: {

82
src/api/inStorage/deliveryNotice.js
View File

@ -14,46 +14,46 @@ export default {
}) })
}, },
// 详情初始化 // // 详情初始化
init: function(data) { // init: function(data) {
return request({ // return request({
url: '/wms/apiadmin/WmsAnsBill/details?sid=' + data, // url: '/wms/apiadmin/WmsAnsBill/details?sid=' + data,
method: 'get' // method: 'get'
}); // });
}, // },
// 收货初始化 // // 收货初始化
getInitDetails: function(data) { // getInitDetails: function(data) {
return request({ // return request({
url: '/wms/apiadmin/inventory/WmsReceiptBill/getInitDetails?sourceSid=' + data, // url: '/wms/apiadmin/inventory/WmsReceiptBill/getInitDetails?sourceSid=' + data,
method: 'get' // method: 'get'
}); // });
}, // },
// 新增收货单 // // 新增收货单
save: function(data) { // save: function(data) {
return request({ // return request({
url: '/wms/apiadmin/inventory/WmsReceiptBill/saveOrUpdate', // url: '/wms/apiadmin/inventory/WmsReceiptBill/saveOrUpdate',
method: 'post', // method: 'post',
data: data, // data: data,
headers: { // headers: {
'Content-Type': 'application/json' // 'Content-Type': 'application/json'
} // }
}); // });
}, // },
// 确认收货单 // // 确认收货单
submit: function(data) { // submit: function(data) {
return request({ // return request({
url: '/wms/apiadmin/inventory/WmsReceiptBill/confirm', // url: '/wms/apiadmin/inventory/WmsReceiptBill/confirm',
method: 'post', // method: 'post',
data: data, // data: data,
headers: { // headers: {
'Content-Type': 'application/json' // 'Content-Type': 'application/json'
} // }
}); // });
}, // },
@ -62,7 +62,7 @@ export default {
// 查询发货人信息 // 查询发货人信息
fetchDetailsBySid: function(data) { fetchDetailsBySid: function(data) {
return request({ return request({
url: '/wms/apiadmin/supplierinfo/fetchDetailsBySid/' + data, url: '/wms/apiadmin/supplierinfo/fetchDetailsByBillSid/' + data,
method: 'get', method: 'get',
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'

30
src/api/reports/inOutStorage.js
View File

@ -31,8 +31,8 @@ export default {
// 查询所有仓库 // 查询所有仓库
getWarehouses: function(params) { getWarehouses: function(params) {
return request({ return request({
url: '/wms/apiadmin/base/wmswarehouseinfo/listAll', url: '/wms/apiadmin/warehouseinfo/listAll',
method: 'post', method: 'post',
data: params, data: params,
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
@ -40,13 +40,29 @@ export default {
}) })
}, },
// 根据仓库查询库位 // 根据仓库查询库区
getWarehouseareas: function(data) { getWarehouseareas: function(data) {
return request({ return request({
url: '/wms/apiadmin/base/wmswarehousearea/selectAll', url: '/wms/apiadmin/warehousearea/selectAll',
method: 'get', method: 'get',
params: data, params: data,
headers: { 'Content-Type': 'application/json' } headers: {
'Content-Type': 'application/json'
}
}); });
}, },
// 根据仓库查询库位
getWarehouserack: function(data) {
return request({
url: '/apiadmin/warehouserack/selectAll',
method: 'get',
params: data,
headers: {
'Content-Type': 'application/json'
}
})
},
} }

207
src/views/baseInfo/supplier/supplier/supplierAdd.vue
View File

@ -14,105 +14,58 @@
<el-row style="border-top: 1px solid #e0e3eb"> <el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8"> <el-col :span="8">
<div class="span-sty"><span class="icon">*</span>供应商名称</div> <div class="span-sty"><span class="icon">*</span>供应商名称</div>
<el-form-item prop="supplierName"><el-input <el-form-item prop="supplierName"><el-input v-model="formobj.supplierName" class="addinputInfo addinputw"
v-model="formobj.supplierName" clearable placeholder="" /></el-form-item>
class="addinputInfo addinputw"
clearable
placeholder=""
/></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty"><span class="icon">*</span>供应商简称</div> <div class="span-sty"><span class="icon">*</span>供应商简称</div>
<el-form-item prop="supplierPY"><el-input <el-form-item prop="supplierPY"><el-input v-model="formobj.supplierPY" class="addinputInfo addinputw"
v-model="formobj.supplierPY" clearable placeholder="" /></el-form-item>
class="addinputInfo addinputw"
clearable
placeholder=""
/></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty"><span class="icon">*</span>供应商编码</div> <div class="span-sty"><span class="icon">*</span>供应商编码</div>
<el-form-item prop="supplierCode"><el-input <el-form-item prop="supplierCode"><el-input v-model="formobj.supplierCode" class="addinputInfo addinputw"
v-model="formobj.supplierCode" clearable placeholder="" /></el-form-item>
class="addinputInfo addinputw"
clearable
placeholder=""
/></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty"><span class="icon">*</span>供应商类型</div> <div class="span-sty"><span class="icon">*</span>供应商类型</div>
<el-form-item prop="supplierTypeSid"> <el-form-item prop="supplierTypeSid">
<el-select <el-select v-model="formobj.supplierTypeSid" class="addinputInfo" filterable placeholder=""
v-model="formobj.supplierTypeSid" @change="supplierTypeChange">
class="addinputInfo" <el-option v-for="item in supplierType_list" :key="item.sid" :label="item.supplierTypeName"
filterable :value="item.sid" />
placeholder=""
@change="supplierTypeChange"
>
<el-option
v-for="item in supplierType_list"
:key="item.sid"
:label="item.supplierTypeName"
:value="item.sid"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty"><span class="icon">*</span>供应商电话</div> <div class="span-sty"><span class="icon">*</span>供应商电话</div>
<el-form-item prop="contactTelePhone"><el-input <el-form-item prop="contactTelePhone"><el-input v-model="formobj.contactTelePhone"
v-model="formobj.contactTelePhone" class="addinputInfo addinputw" clearable placeholder="" /></el-form-item>
class="addinputInfo addinputw"
clearable
placeholder=""
/></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">传真</div> <div class="span-sty">传真</div>
<el-form-item><el-input <el-form-item><el-input v-model="formobj.fax" class="addinputInfo addinputw" clearable
v-model="formobj.fax" placeholder="" /></el-form-item>
class="addinputInfo addinputw"
clearable
placeholder=""
/></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">详细地址</div> <div class="span-sty">详细地址</div>
<el-form-item> <el-form-item>
<div <div class="addinputInfo"
class="addinputInfo" style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center">
style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center" <el-select v-model="formobj.province" filterable clearable placeholder="请选择省" style="width:160px"
> @change="provinceChange">
<el-select
v-model="formobj.province"
filterable
clearable
placeholder="请选择省"
style="width:160px"
@change="provinceChange"
>
<el-option v-for="item in province_list" :key="item.sid" :label="item.name" :value="item.name" /> <el-option v-for="item in province_list" :key="item.sid" :label="item.name" :value="item.name" />
</el-select> </el-select>
<el-select <el-select v-model="formobj.city" filterable placeholder="请选择市" style="width:160px"
v-model="formobj.city" @change="cityChange">
filterable
placeholder="请选择市"
style="width:160px"
@change="cityChange"
>
<el-option v-for="item in city_list" :key="item.sid" :label="item.name" :value="item.name" /> <el-option v-for="item in city_list" :key="item.sid" :label="item.name" :value="item.name" />
</el-select> </el-select>
<el-select <el-select v-model="formobj.county" filterable placeholder="请选择县" style="width:160px"
v-model="formobj.county" @change="countyChange">
filterable
placeholder="请选择县"
style="width:160px"
@change="countyChange"
>
<el-option v-for="item in county_list" :key="item.sid" :label="item.name" :value="item.name" /> <el-option v-for="item in county_list" :key="item.sid" :label="item.name" :value="item.name" />
</el-select> </el-select>
<el-input v-model="formobj.address" style="width: 30%" clearable placeholder="" /> <el-input v-model="formobj.address" style="width: 30%" clearable placeholder="" />
@ -123,131 +76,77 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">联系人</div> <div class="span-sty">联系人</div>
<el-form-item><el-input <el-form-item><el-input v-model="formobj.contactName" class="addinputInfo addinputw" clearable
v-model="formobj.contactName" placeholder="" /></el-form-item>
class="addinputInfo addinputw"
clearable
placeholder=""
/></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">联系电话</div> <div class="span-sty">联系电话</div>
<el-form-item><el-input <el-form-item><el-input v-model="formobj.contactMobile" class="addinputInfo addinputw" clearable
v-model="formobj.contactMobile" placeholder="" /></el-form-item>
class="addinputInfo addinputw"
clearable
placeholder=""
/></el-form-item>
</el-col> </el-col>
<el-col :span="8" /> <el-col :span="8" />
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">邮编</div> <div class="span-sty">邮编</div>
<el-form-item><el-input <el-form-item><el-input v-model="formobj.zipCode" class="addinputInfo addinputw" clearable
v-model="formobj.zipCode" placeholder="" /></el-form-item>
class="addinputInfo addinputw"
clearable
placeholder=""
/></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">电子邮件</div> <div class="span-sty">电子邮件</div>
<el-form-item><el-input <el-form-item><el-input v-model="formobj.email" class="addinputInfo addinputw" clearable
v-model="formobj.email" placeholder="" /></el-form-item>
class="addinputInfo addinputw"
clearable
placeholder=""
/></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">网址</div> <div class="span-sty">网址</div>
<el-form-item><el-input <el-form-item><el-input v-model="formobj.website" class="addinputInfo addinputw" clearable
v-model="formobj.website" placeholder="" /></el-form-item>
class="addinputInfo addinputw"
clearable
placeholder=""
/></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty"><span class="icon">*</span>开票公司名称</div> <div class="span-sty"><span class="icon">*</span>开票公司名称</div>
<el-form-item prop="billingCompanyName"><el-input <el-form-item prop="billingCompanyName"><el-input v-model="formobj.billingCompanyName"
v-model="formobj.billingCompanyName" class="addinputInfo addinputw" clearable placeholder="" /></el-form-item>
class="addinputInfo addinputw"
clearable
placeholder=""
/></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">税号</div> <div class="span-sty">税号</div>
<el-form-item><el-input <el-form-item><el-input v-model="formobj.registNum" class="addinputInfo addinputw" clearable
v-model="formobj.registNum" placeholder="" /></el-form-item>
class="addinputInfo addinputw"
clearable
placeholder=""
/></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">法人</div> <div class="span-sty">法人</div>
<el-form-item><el-input <el-form-item><el-input v-model="formobj.legalName" class="addinputInfo addinputw" clearable
v-model="formobj.legalName" placeholder="" /></el-form-item>
class="addinputInfo addinputw"
clearable
placeholder=""
/></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">采购员</div> <div class="span-sty">采购员</div>
<el-form-item><el-input <el-form-item><el-input v-model="formobj.purchaser" class="addinputInfo addinputw" clearable
v-model="formobj.purchaser" placeholder="" /></el-form-item>
class="addinputInfo addinputw"
clearable
placeholder=""
/></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty"><span class="icon">*</span>开票类型</div> <div class="span-sty"><span class="icon">*</span>开票类型</div>
<el-form-item prop="billingTypeValue"> <el-form-item prop="billingTypeValue">
<el-select <el-select v-model="formobj.billingTypeValue" class="addinputInfo" filterable placeholder=""
v-model="formobj.billingTypeValue" @change="billingTypeChange">
class="addinputInfo" <el-option v-for="item in billingType_list" :key="item.dictKey" :label="item.dictValue"
filterable :value="item.dictValue" />
placeholder=""
@change="billingTypeChange"
>
<el-option
v-for="item in billingType_list"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictValue"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty"><span class="icon">*</span>税率</div> <div class="span-sty"><span class="icon">*</span>税率</div>
<el-form-item prop="taxRate"><el-input <el-form-item prop="taxRate"><el-input v-model="formobj.taxRate" class="addinputInfo addinputw" clearable
v-model="formobj.taxRate" placeholder="" @keyup.native="formobj.taxRate = getNumber(formobj.taxRate, 2)" /></el-form-item>
class="addinputInfo addinputw"
clearable
placeholder=""
@keyup.native="formobj.taxRate = getNumber(formobj.taxRate, 2)"
/></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item><el-input <el-form-item><el-input v-model="formobj.remarks" class="addinputInfo addinputw" clearable
v-model="formobj.remarks" placeholder="" /></el-form-item>
class="addinputInfo addinputw"
clearable
placeholder=""
/></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title titleOne"> <div class="title titleOne">
@ -339,9 +238,10 @@
taxRate: '', taxRate: '',
remarks: '', remarks: '',
baseSupplierBankList: [], baseSupplierBankList: [],
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid') userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
}, },
rules: { rules: {
supplierName: [{ supplierName: [{
@ -609,9 +509,10 @@
taxRate: '', taxRate: '',
remarks: '', remarks: '',
baseSupplierBankList: [], baseSupplierBankList: [],
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid') userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
} }
this.submitdisabled = false this.submitdisabled = false
this.$emit('doback') this.$emit('doback')

7
src/views/baseInfo/supplier/suppliertype/suppliertype.vue
View File

@ -137,9 +137,10 @@
sid: '', sid: '',
supplierTypeName: '', supplierTypeName: '',
supplierTypeCode: '', supplierTypeCode: '',
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
} }
} }
}, },
@ -232,9 +233,10 @@
sid: '', sid: '',
supplierTypeName: '', supplierTypeName: '',
supplierTypeCode: '', supplierTypeCode: '',
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
} }
}, },
toEdit(row) { toEdit(row) {
@ -246,6 +248,7 @@
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('defaultDeptSid'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
} }
}, },
handleConfirm() { handleConfirm() {

6
src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue
View File

@ -69,9 +69,10 @@
locationName: '', locationName: '',
locationSid: '', locationSid: '',
remarks: '', remarks: '',
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
}, },
warehouseList: [], warehouseList: [],
warehouseAreaList: [], warehouseAreaList: [],
@ -138,9 +139,10 @@
locationName: '', locationName: '',
locationSid: '', locationSid: '',
remarks: '', remarks: '',
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
} }
this.$emit('doback') this.$emit('doback')
}, },

6
src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue
View File

@ -105,9 +105,10 @@
sortNo: '', sortNo: '',
remarks: '', remarks: '',
warehouseType: "0", warehouseType: "0",
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
}, },
} }
}, },
@ -171,9 +172,10 @@
sortNo: '', sortNo: '',
remarks: '', remarks: '',
warehouseType: "0", warehouseType: "0",
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
} }
this.$emit('doback') this.$emit('doback')
}, },

6
src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue
View File

@ -81,9 +81,10 @@
warehouseSid: '', warehouseSid: '',
areaTypeSid: "", areaTypeSid: "",
areaTypeName: "", areaTypeName: "",
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
}, },
warehouseList: [], warehouseList: [],
warehouseTypeList: [], warehouseTypeList: [],
@ -164,9 +165,10 @@
warehouseSid: '', warehouseSid: '',
areaTypeSid: "", areaTypeSid: "",
areaTypeName: "", areaTypeName: "",
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
} }
this.$emit('doback') this.$emit('doback')

7
src/views/baseInfo/warehouses/warehouseAreaType/warehouseAreaTypeAdd.vue
View File

@ -44,10 +44,10 @@
sid: '', sid: '',
warehouseAreaTypeName: '', warehouseAreaTypeName: '',
remarks: '', remarks: '',
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
}, },
} }
}, },
@ -76,9 +76,10 @@
sid: '', sid: '',
warehouseAreaTypeName: '', warehouseAreaTypeName: '',
remarks: '', remarks: '',
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
} }
this.$emit('doback') this.$emit('doback')
}, },

6
src/views/goods/brands/brandsAdd.vue
View File

@ -121,9 +121,10 @@
remarks: '', remarks: '',
letter: '', letter: '',
image: "", image: "",
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
}, },
hideUploadBtn: false, hideUploadBtn: false,
hideUploadBtn2: false, hideUploadBtn2: false,
@ -228,9 +229,10 @@
remarks: '', remarks: '',
letter: '', letter: '',
image: "", image: "",
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
} }
this.$emit('doback') this.$emit('doback')
}, },

6
src/views/goods/category/categoryAdd.vue
View File

@ -173,9 +173,10 @@
pname: '', pname: '',
sortNo: '', sortNo: '',
remarks: '', remarks: '',
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
}, },
goodsTypeList: [], goodsTypeList: [],
outStockRuleList: [], outStockRuleList: [],
@ -301,9 +302,10 @@
pname: '', pname: '',
sortNo: '', sortNo: '',
remarks: '', remarks: '',
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
} }
this.$emit('doback') this.$emit('doback')
}, },

6
src/views/goods/factory/factoryAdd.vue
View File

@ -94,9 +94,10 @@
manufacturerCode: '', manufacturerCode: '',
sortNo: '', sortNo: '',
remarks: "", remarks: "",
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
}, },
rules: { rules: {
manufacturerName: [{ manufacturerName: [{
@ -179,9 +180,10 @@
manufacturerCode: '', manufacturerCode: '',
sortNo: '', sortNo: '',
remarks: "", remarks: "",
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
} }
this.$emit('doback') this.$emit('doback')
}, },

6
src/views/goods/goods/goodsAdd.vue
View File

@ -791,9 +791,10 @@
goodsDescription: "" goodsDescription: ""
}, },
baseGoodsSkus: [], baseGoodsSkus: [],
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
}, },
brandList: [], brandList: [],
cateList: [], cateList: [],
@ -928,9 +929,10 @@
goodsDescription: "" goodsDescription: ""
}, },
baseGoodsSkus: [], baseGoodsSkus: [],
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
} }
this.$emit('doback') this.$emit('doback')
}, },

6
src/views/goods/unit/unitAdd.vue
View File

@ -62,9 +62,10 @@
sid: '', sid: '',
unitName: '', unitName: '',
remarks: '', remarks: '',
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
}, },
rules: { rules: {
unitName: [{ unitName: [{
@ -118,9 +119,10 @@
sid: '', sid: '',
unitName: '', unitName: '',
remarks: '', remarks: '',
orgPath: window.sessionStorage.getItem('defaultDeptSid'), orgPath: window.sessionStorage.getItem('orgSidPath'),
useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), useOrgSid: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
} }
this.$emit('doback') this.$emit('doback')
}, },

81
src/views/inStorage/deliveryNotice/index.vue
View File

@ -15,6 +15,12 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="入库状态">
<el-select v-model="queryParams.params.billState" placeholder="请选择" style="width: 200px;">
<el-option v-for="(item,i) in billStateList" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="外部单号"> <el-form-item label="外部单号">
<el-input v-model="queryParams.params.sourceBillNo" placeholder="" clearable /> <el-input v-model="queryParams.params.sourceBillNo" placeholder="" clearable />
</el-form-item> </el-form-item>
@ -23,7 +29,7 @@
</el-form-item> </el-form-item>
<el-form-item label="商品"> <el-form-item label="商品">
<el-select v-model="queryParams.params.goodsSkuSid" placeholder="请选择" style="width: 220px;"> <el-select v-model="queryParams.params.goodsSkuSid" placeholder="请选择" style="width: 220px;">
<el-option v-for="(item,i) in goodsList" :key="i" :label="item.name" :value="item.sid"> <el-option v-for="(item,i) in goodsList" :key="i" :label="item.title" :value="item.sid">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -35,21 +41,16 @@
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"> format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="入库状态">
<el-select v-model="queryParams.params.billState" placeholder="请选择">
<el-option v-for="(item,i) in billStateList" :key="item.sid" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="承运商"> <el-form-item label="承运商">
<el-input v-model="queryParams.params.supplierName" placeholder="" clearable /> <el-input v-model="queryParams.params.carrier" placeholder="" clearable />
</el-form-item> </el-form-item>
<el-form-item label="运单号"> <el-form-item label="运单号">
<el-input v-model="queryParams.params.waybillNumber" placeholder="" clearable /> <el-input v-model="queryParams.params.waybillNumber" placeholder="" clearable />
</el-form-item> </el-form-item>
<el-form-item label="库位"> <el-form-item label="库位">
<el-select v-model="queryParams.params.warehouseRackSid" placeholder="请选择库位"> <el-select v-model="queryParams.params.warehouseRackSid" placeholder="请选择库位" style="width: 200px;">
<el-option v-for="item in warehouseRackList" :key="item.sid" :label="item.rackName" <el-option v-for="item in warehouseRackList" :key="item.sid" :label="item.rackCode"
:value="item.sid"> :value="item.sid">
</el-option> </el-option>
</el-select> </el-select>
@ -88,19 +89,19 @@
<el-table-column prop="warehouseName" label="仓库" align="center" width="150" /> <el-table-column prop="warehouseName" label="仓库" align="center" width="150" />
<el-table-column label="入库库位" align="center" width="180"> <el-table-column label="入库库位" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.warehouseAreaName" placeholder="请选择" <el-select v-model="scope.row.warehouseRackName" placeholder="请选择"
@focus="getWarehouseAreaList(scope.row.warehouseSid)" @focus="getWarehouseAreaList(scope.row.warehouseSid)"
@change="selectWarehouseAreaCode(scope.row,$event)"> @change="selectWarehouseAreaCode(scope.row,$event)">
<el-option v-for="(item,i) in warehouseRackList2" :key="i" :label="item.areaCode" :value="item.sid"> <el-option v-for="(item,i) in warehouseRackList2" :key="i" :label="item.rackName" :value="item.sid">
</el-option> </el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> --> </el-table-column>
<el-table-column prop="applicant" label="申请人" align="center" width="150" /> <el-table-column prop="applicant" label="申请人" align="center" width="150" />
<el-table-column prop="reservationTime" label="预约时间" align="center" width="150" /> <el-table-column prop="reservationTime" label="预约时间" align="center" width="180" />
<el-table-column prop="supplierName" label="供应商" align="center" width="150" /> <el-table-column prop="supplierName" label="供应商" align="center" width="150" />
<el-table-column prop="sourceBillNo" label="外部单号" align="center" width="150" /> <el-table-column prop="sourceBillNo" label="外部单号" align="center" width="150" />
<el-table-column label="单据备注" align="center" width="180"> <el-table-column label="单据备注" align="center" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input ref="" v-model="scope.row.remarks" clearable placeholder="" <el-input ref="" v-model="scope.row.remarks" clearable placeholder=""
@change="itemRemarks(scope.row)" /> @change="itemRemarks(scope.row)" />
@ -108,6 +109,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="contact" label="联系人" align="center" width="150" /> <el-table-column prop="contact" label="联系人" align="center" width="150" />
<el-table-column prop="mobile" label="联系电话" align="center" width="150" /> <el-table-column prop="mobile" label="联系电话" align="center" width="150" />
<el-table-column prop="carrier" label="承运商" align="center" width="150" />
<el-table-column prop="waybillNumber" label="运单号" align="center" width="150" />
</el-table> </el-table>
@ -228,8 +231,8 @@
// import divAdd from './receiptAdd.vue' // import divAdd from './receiptAdd.vue'
// import divInfo from './receiptInfo.vue' // import divInfo from './receiptInfo.vue'
import { import {
getWarehouseareas, typeValues,
getWarehouseAacks getWarehouserack
} from '@/api/Common/dictcommons' } from '@/api/Common/dictcommons'
export default { export default {
components: { components: {
@ -290,7 +293,7 @@
"applicationTimeStart": "", "applicationTimeStart": "",
"applicationTimeEnd": "", "applicationTimeEnd": "",
"billState": "", "billState": "",
"supplierName": "", "carrier": "",
"waybillNumber": "", "waybillNumber": "",
"warehouseRackSid": "", "warehouseRackSid": "",
"menuUrl": "", "menuUrl": "",
@ -313,23 +316,7 @@
sid: "2" sid: "2"
} }
], ],
billStateList: [{ billStateList: [],
name: "在途",
sid: "0"
},
{
name: "部分收货",
sid: "1"
},
{
name: "收货完成",
sid: "2"
},
{
name: "关闭",
sid: "3"
}
],
goodsList: [], goodsList: [],
warehouseRackList: [], warehouseRackList: [],
goodsDetailList: [], goodsDetailList: [],
@ -347,6 +334,16 @@
}, },
methods: { methods: {
init() { init() {
typeValues({
type: 'receiveState'
}).then((res) => {
if (res.success) {
this.billStateList = res.data
}
})
var query = { var query = {
orgPath: window.sessionStorage.getItem('orgSidPath') orgPath: window.sessionStorage.getItem('orgSidPath')
} }
@ -515,7 +512,7 @@
"applicationTimeStart": "", "applicationTimeStart": "",
"applicationTimeEnd": "", "applicationTimeEnd": "",
"billState": "", "billState": "",
"supplierName": "", "carrier": "",
"waybillNumber": "", "waybillNumber": "",
"warehouseRackSid": "", "warehouseRackSid": "",
"menuUrl": "", "menuUrl": "",
@ -534,7 +531,7 @@
var query = { var query = {
ckSid: sid ckSid: sid
} }
getWarehouseareas(query).then((res) => { getWarehouserack(query).then((res) => {
if (res.success) { if (res.success) {
this.warehouseRackList2 = res.data this.warehouseRackList2 = res.data
} }
@ -545,12 +542,13 @@
const choose = this.warehouseRackList2.filter((item) => item.sid == val) const choose = this.warehouseRackList2.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseAreaCode', choose) console.log('>>>>>>>>>selectWarehouseAreaCode', choose)
row.warehouseAreaName = choose[0].areaCode row.warehouseRackName = choose[0].rackName
row.warehouseAreaSid = choose[0].sid row.warehouseRackSid = choose[0].sid
var query = { var query = {
sid: row.sid, sid: row.sid,
rackSid: row.warehouseAreaSid rackSid: row.warehouseRackSid,
userSid: window.sessionStorage.getItem('userSid')
} }
req.updateRack(query).then((res) => {}) req.updateRack(query).then((res) => {})
@ -560,7 +558,8 @@
var query = { var query = {
sid: row.sid, sid: row.sid,
remarks: row.remarks remarks: row.remarks,
userSid: window.sessionStorage.getItem('userSid')
} }
req.updateRemarks(query).then((res) => {}) req.updateRemarks(query).then((res) => {})

Write Preview
Loading…
Cancel
Save