fengyuan_yang
/
boying-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2026-01-16 

收货入库任务通知/拣货出库任务通知页面，新增入库类别/出库类别
master
fengyuan_yang 3 days ago
parent
ac03b759d5
commit
fdadcaf4a1
4 changed files with 63 additions and 7 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. 2
      src/api/qc/Inbound_notification.js
  2. 2
      src/api/qc/outbound_notification.js
  3. 32
      src/views/modules/qc/inboundNotification.vue
  4. 34
      src/views/modules/qc/outboundNotification.vue

2
src/api/qc/Inbound_notification.js
View File

@ -25,4 +25,6 @@ export const deleteInboundDetail = data => createAPI('/inbound/deleteInboundDeta
export const updateInboundDetail = data => createAPI('/inbound/updateInboundDetail','post',data) export const updateInboundDetail = data => createAPI('/inbound/updateInboundDetail','post',data)
// 获取入库明细 // 获取入库明细
export const getInboundDetail2 = data => createAPI('/inbound/getInboundDetail2','post',data) export const getInboundDetail2 = data => createAPI('/inbound/getInboundDetail2','post',data)
// 查询入库类别列表
export const getInboundCategoryList = data => createAPI('/inbound/getInboundCategoryList','post',data)

2
src/api/qc/outbound_notification.js
View File

@ -26,4 +26,6 @@ export const deleteOutboundDetail = data => createAPI('/outbound/deleteOutboundD
export const updateOutboundDetail = data => createAPI('/outbound/updateOutboundDetail','post',data) export const updateOutboundDetail = data => createAPI('/outbound/updateOutboundDetail','post',data)
// 获取出库明细 // 获取出库明细
export const getOutboundDetail2 = data => createAPI('/outbound/getOutboundDetail2','post',data) export const getOutboundDetail2 = data => createAPI('/outbound/getOutboundDetail2','post',data)
// 查询出库类别列表
export const getOutboundCategoryList = data => createAPI('/outbound/getOutboundCategoryList','post',data)

32
src/views/modules/qc/inboundNotification.vue
View File

@ -122,7 +122,7 @@
</el-pagination> </el-pagination>
<!-- 收货入库通知新增/修改 --> <!-- 收货入库通知新增/修改 -->
<el-dialog title="收货入库通知" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="525px">
<el-dialog title="收货入库通知" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="545px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="BU" prop="bu"> <el-form-item label="BU" prop="bu">
<el-select v-model="modalData.bu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 100px"> <el-select v-model="modalData.bu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 100px">
@ -152,18 +152,28 @@
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="入库类别">
<el-select v-model="modalData.category" placeholder="请选择" clearable style="width: 140px">
<el-option
v-for="item in categoryList"
:key="item.crdcode"
:label="item.crdcode + '-' + item.crdname"
:value="item.crdcode">
</el-option>
</el-select>
</el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px"> <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px">
<el-form-item> <el-form-item>
<!-- <span v-if="modalDisableFlag" slot="label">供应商</span>--> <!-- <span v-if="modalDisableFlag" slot="label">供应商</span>-->
<span style="cursor: pointer" slot="label" @click="getBaseList(506)"><a href="#">供应商</a></span> <span style="cursor: pointer" slot="label" @click="getBaseList(506)"><a href="#">供应商</a></span>
<el-input v-model="modalData.supplierId" @change="supplierBlur(506)" style="width: 100px"></el-input>
<el-input v-model="modalData.supplierId" @change="supplierBlur(506)" style="width: 120px"></el-input>
<el-input v-model="modalData.supplierName" disabled style="width: 380px"></el-input> <el-input v-model="modalData.supplierName" disabled style="width: 380px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px"> <el-form :inline="true" label-position="top" style="margin-left: 7px">
<el-form-item :label="'备注'"> <el-form-item :label="'备注'">
<el-input type="textarea" v-model="modalData.remarks" :rows="3" resize='none' show-word-limit style="width: 485px;height: 20px"></el-input>
<el-input type="textarea" v-model="modalData.remarks" :rows="3" resize='none' show-word-limit style="width: 505px;height: 20px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-footer style="height:35px;margin-top: 55px;text-align:center"> <el-footer style="height:35px;margin-top: 55px;text-align:center">
@ -662,6 +672,7 @@
getInboundPartList, // 查物料 getInboundPartList, // 查物料
updateInboundDetail, // 批量编辑明细 updateInboundDetail, // 批量编辑明细
getInboundDetail2, // 获取入库明细 getInboundDetail2, // 获取入库明细
getInboundCategoryList, // 查询入库类别列表
} from "@/api/qc/Inbound_notification.js" } from "@/api/qc/Inbound_notification.js"
import { import {
getSiteAndBuByUserName, getSiteAndBuByUserName,
@ -738,7 +749,9 @@
remarks: '', remarks: '',
createdBy: '', createdBy: '',
updatedBy: '', updatedBy: '',
category: '', // 入库类别
}, },
categoryList: [], // 入库类别列表
dataList: [], dataList: [],
detailList: [], detailList: [],
userBuList: [], userBuList: [],
@ -1252,8 +1265,10 @@
supplierName: '', supplierName: '',
remarks: '', remarks: '',
createdBy: this.$store.state.user.name, createdBy: this.$store.state.user.name,
category: '', // 入库类别
} }
this.modalDisableFlag = false this.modalDisableFlag = false
this.loadCategoryList() // 加载入库类别列表
this.modalFlag = true this.modalFlag = true
}, },
@ -1274,8 +1289,10 @@
supplierName: row.supplierName, supplierName: row.supplierName,
remarks: row.remarks, remarks: row.remarks,
updatedBy: this.$store.state.user.name, updatedBy: this.$store.state.user.name,
category: row.category || '', // 入库类别
} }
this.modalDisableFlag = true this.modalDisableFlag = true
this.loadCategoryList() // 加载入库类别列表
this.modalFlag = true this.modalFlag = true
}, },
@ -1814,6 +1831,15 @@
this.authClose = !closeFlag this.authClose = !closeFlag
this.authIssue = !issueFlag this.authIssue = !issueFlag
}, },
// 加载入库类别列表
loadCategoryList () {
getInboundCategoryList({}).then(({data}) => {
if (data && data.code === 0) {
this.categoryList = data.rows || []
}
})
},
} }
} }
</script> </script>

34
src/views/modules/qc/outboundNotification.vue
View File

@ -123,7 +123,7 @@
</el-pagination> </el-pagination>
<!-- 拣货出库通知新增/修改 --> <!-- 拣货出库通知新增/修改 -->
<el-dialog title="拣货出库通知" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="525px">
<el-dialog title="拣货出库通知" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="545px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="BU" prop="bu"> <el-form-item label="BU" prop="bu">
<el-select v-model="modalData.bu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 100px"> <el-select v-model="modalData.bu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 100px">
@ -153,24 +153,34 @@
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="出库类别">
<el-select v-model="modalData.category" placeholder="请选择" clearable style="width: 140px">
<el-option
v-for="item in categoryList"
:key="item.crdcode"
:label="item.crdcode + '-' + item.crdname"
:value="item.crdcode">
</el-option>
</el-select>
</el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px"> <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px">
<!-- 采购退货时显示供应商 --> <!-- 采购退货时显示供应商 -->
<el-form-item v-if="modalData.orderType === '采购退货'"> <el-form-item v-if="modalData.orderType === '采购退货'">
<span style="cursor: pointer" slot="label" @click="getBaseList(506)"><a href="#">供应商</a></span> <span style="cursor: pointer" slot="label" @click="getBaseList(506)"><a href="#">供应商</a></span>
<el-input v-model="modalData.customerId" @change="customerBlur(506)" style="width: 100px"></el-input>
<el-input v-model="modalData.customerId" @change="customerBlur(506)" style="width: 120px"></el-input>
<el-input v-model="modalData.customerName" disabled style="width: 380px"></el-input> <el-input v-model="modalData.customerName" disabled style="width: 380px"></el-input>
</el-form-item> </el-form-item>
<!-- 其他出库时显示直接客户 --> <!-- 其他出库时显示直接客户 -->
<el-form-item v-else-if="modalData.orderType === '其他出库'"> <el-form-item v-else-if="modalData.orderType === '其他出库'">
<span style="cursor: pointer" slot="label" @click="getBaseList(507)"><a href="#">直接客户</a></span> <span style="cursor: pointer" slot="label" @click="getBaseList(507)"><a href="#">直接客户</a></span>
<el-input v-model="modalData.customerId" @change="customerBlur(507)" style="width: 100px"></el-input>
<el-input v-model="modalData.customerId" @change="customerBlur(507)" style="width: 120px"></el-input>
<el-input v-model="modalData.customerName" disabled style="width: 380px"></el-input> <el-input v-model="modalData.customerName" disabled style="width: 380px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px"> <el-form :inline="true" label-position="top" style="margin-left: 7px">
<el-form-item :label="'备注'"> <el-form-item :label="'备注'">
<el-input type="textarea" v-model="modalData.remarks" :rows="3" resize='none' show-word-limit style="width: 485px;height: 20px"></el-input>
<el-input type="textarea" v-model="modalData.remarks" :rows="3" resize='none' show-word-limit style="width: 505px;height: 20px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-footer style="height:35px;margin-top: 55px;text-align:center"> <el-footer style="height:35px;margin-top: 55px;text-align:center">
@ -629,6 +639,7 @@
getOutboundPartList, // 查物料 getOutboundPartList, // 查物料
updateOutboundDetail, // 批量编辑明细 updateOutboundDetail, // 批量编辑明细
getOutboundDetail2, // 获取出库明细 getOutboundDetail2, // 获取出库明细
getOutboundCategoryList, // 查询出库类别列表
} from "@/api/qc/outbound_notification.js" } from "@/api/qc/outbound_notification.js"
import { import {
getSiteAndBuByUserName, getSiteAndBuByUserName,
@ -706,7 +717,9 @@
remarks: '', remarks: '',
createdBy: '', createdBy: '',
updatedBy: '', updatedBy: '',
category: '', // 出库类别
}, },
categoryList: [], // 出库类别列表
dataList: [], dataList: [],
detailList: [], detailList: [],
userBuList: [], userBuList: [],
@ -1186,8 +1199,10 @@
customerName: '', customerName: '',
remarks: '', remarks: '',
createdBy: this.$store.state.user.name, createdBy: this.$store.state.user.name,
category: '', // 出库类别
} }
this.modalDisableFlag = false this.modalDisableFlag = false
this.loadCategoryList() // 加载出库类别列表
this.modalFlag = true this.modalFlag = true
}, },
@ -1208,8 +1223,10 @@
customerName: row.customerName, customerName: row.customerName,
remarks: row.remarks, remarks: row.remarks,
updatedBy: this.$store.state.user.name, updatedBy: this.$store.state.user.name,
category: row.category || '', // 出库类别
} }
this.modalDisableFlag = true this.modalDisableFlag = true
this.loadCategoryList() // 加载出库类别列表
this.modalFlag = true this.modalFlag = true
}, },
@ -1837,6 +1854,15 @@
this.authClose = !closeFlag this.authClose = !closeFlag
this.authIssue = !issueFlag this.authIssue = !issueFlag
}, },
// 加载出库类别列表
loadCategoryList () {
getOutboundCategoryList({}).then(({data}) => {
if (data && data.code === 0) {
this.categoryList = data.rows || []
}
})
},
} }
} }
</script> </script>

Write Preview
Loading…
Cancel
Save