diff --git a/src/api/wisdom/borrow.js b/src/api/wisdom/borrow.js
index 6163686..290890f 100644
--- a/src/api/wisdom/borrow.js
+++ b/src/api/wisdom/borrow.js
@@ -1,20 +1,4 @@
import request from '@/utils/request'
-//借料记录列表
-export function listOutbound(data) {
- return request({
- url: '/wisdom/stock/borrow/list',
- method: 'post',
- data: data
- })
-}
-// 借料出库保存
-export function addOutbound(data) {
- return request({
- url: '/wisdom/stock/outStock',
- method: 'put',
- data: data
- })
-}
// 还料入库保存
export function returnSubmit(data) {
return request({
@@ -22,4 +6,12 @@ export function returnSubmit(data) {
method: 'post',
data: data
})
+ }
+ // 新增借调查询项目号列表
+ export function listStockByXm(data) {
+ return request({
+ url: '/wisdom/stock/list',
+ method: 'get',
+ params: data
+ })
}
\ No newline at end of file
diff --git a/src/views/plan/jh/index.vue b/src/views/plan/jh/index.vue
index a06d870..cb44427 100644
--- a/src/views/plan/jh/index.vue
+++ b/src/views/plan/jh/index.vue
@@ -177,6 +177,8 @@
+
+
diff --git a/src/views/wisdom/bill/index.vue b/src/views/wisdom/bill/index.vue
index 53992a6..b08abfa 100644
--- a/src/views/wisdom/bill/index.vue
+++ b/src/views/wisdom/bill/index.vue
@@ -1,7 +1,7 @@
-
+
@@ -11,7 +11,7 @@
@keyup.enter="handleQuery" />
-
+
@@ -27,7 +27,7 @@
-
+
@@ -37,17 +37,13 @@
-
+
新增入库
-
-
导出
-
-
图片上传
-
+
搜索
重置
@@ -1542,17 +1538,12 @@ function autoFillFun() {
}
// 上传成功回调
function handleAvatarSuccess(res, id, pcode) {
- // console.log(222222)
- // console.log(id)
- // console.log(pcode)
for (let i = 0; i < planList.value.length; i++) {
if (planList.value[i].id == id && planList.value[i].pcode == pcode) {
planList.value[i].photoUrl = res.url;
}
}
- // console.log(222222)
- // console.log(res)
- // console.log(row)
+
}
//删除图片
function handleRemove(res, id, pcode) {
@@ -1561,11 +1552,6 @@ function handleRemove(res, id, pcode) {
planList.value[i].photoUrl = "";
}
}
- // console.log(33333333)
- // console.log(planList.value)
- // console.log(res)
- // console.log(id)
- // console.log(pcode)
}
function delPic(picId) {
proxy.$modal
@@ -1787,4 +1773,9 @@ isAudit();
z-index: 1;
top: -15px;
}
+
+.searchBtn {
+ display: flex;
+ justify-content: flex-end;
+}
diff --git a/src/views/wisdom/borrow/index.vue b/src/views/wisdom/borrow/index.vue
index 37de303..e9fe21c 100644
--- a/src/views/wisdom/borrow/index.vue
+++ b/src/views/wisdom/borrow/index.vue
@@ -1,407 +1,327 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
- 重置
-
-
-
-
-
-
-
- 新增借料
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
-
-
- 打印单据
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ parseTime(scope.row.borrowTime, '{y}-{m}-{d}') }}
-
-
-
-
-
-
-
-
-
- 还料
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -161,11 +162,12 @@ const storeStatusList = ref([
{ id: '0', statusName: "已入库" },
{ id: '1', statusName: "已出库" }
])//库存状态
-
+// 0入库，1出库，2借料出库，3还料入库
const isChukuList = ref([
{ value: '0', label: '入库', elTagType: "success", elTagClass: null },
- { value: '1', label: '借料出库', elTagType: "warning", elTagClass: null },
- { value: '3', label: '还料入库', elTagType: "warning", elTagClass: null },
+ { value: '1', label: '出库', elTagType: "warning", elTagClass: null },
+ { value: '2', label: '借料出库', elTagType: "", elTagClass: null },
+ { value: '3', label: '还料入库', elTagType: "danger", elTagClass: null },
])
const data = reactive({
@@ -311,7 +313,7 @@ rklxList()
// 显示预出库的状态
const tableBillRowClassName = ({ row, rowIndex }) => {
console.log('row===>',row);
-
+
if (row.execStatus == 0) {
return 'success-row'
}
@@ -332,7 +334,7 @@ const dictTagData = () => {
}
.el-table {
/* 核心：把 hover 背景色设为和默认行背景色一致 */
- --el-table-row-hover-bg-color: transparent;
+ --el-table-row-hover-bg-color: transparent;
/* 或设为和表格背景色相同（比如白色），更通用 */
/* --el-table-row-hover-bg-color: #ffffff; */
}