yangzifeng/shzg_projectManage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.100.212.83:3000/yangzifeng/shzg_projectManage

Browse Source
This commit is contained in:
zx
2026-03-26 09:43:52 +08:00
parent 8577991a86 1b22c07654
commit aeb2aa9be2
2 changed files with 57 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/printBill/bill.vue
View File

@@ -83,8 +83,10 @@
<th>项目编号</th>
<th v-if="isRuKu">项目描述</th>
<th>备注</th>
<th>身份码</th>
<th v-if="billAllObj[0]?.wlType == 'WZ008'">需求方</th>
<th v-else>身份码</th>
<th>供应商</th>
<th v-if="billAllObj[0]?.wlType == 'WZ008'">照片</th>
</tr>
</thead>
<tbody>
@@ -99,8 +101,10 @@
<td style="text-align: center;">{{ item.xmNo }}</td>
<td v-if="isRuKu" style="text-align: center;">{{ item.xmMs }}</td>
<td style="text-align: center;">{{ item.remark }}</td>
<td style="text-align: center;">{{ item.entityId }}</td>
<td v-if="billAllObj[0]?.wlType == 'WZ008'" style="text-align: center;">{{ item.demandDeptName }}</td>
<td v-else style="text-align: center;">{{ item.entityId }}</td>
<td style="text-align: center;">{{ item.gysMc }}</td>
<td v-if="billAllObj[0]?.wlType == 'WZ008'" style="text-align: center;">{{ getUploadPhoto(item.isUploadPhoto) }}</td>
</tr>
</tbody>
</table>
@@ -129,6 +133,15 @@ const props = defineProps({
},
});
// 新增库存状态
const uploadPhotoMenu = ref([
{ value: 0, label: "未上传" },
{ value: 1, label: "已上传" },
]);
const getUploadPhoto = (value) => {
return uploadPhotoMenu.value.find((item) => item.value === value)?.label;
};
const isRuKu = computed(() => {
return props.billAllObj[0]?.bizType == 0;

44
src/views/wisdom/bill/index.vue
View File

@@ -75,6 +75,11 @@
}}</span>
</template>
</el-table-column>
<el-table-column label="上传照片" align="center" prop="isUploadPhoto" width="90">
<template #default="scope">
<span>{{ getUploadPhoto(scope.row.isUploadPhoto) || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="理货员" align="center" prop="operatorName" width="100" />
<el-table-column label="操作" align="center" fixed="right" width="260">
<template #default="scope">
@@ -152,6 +157,7 @@
<el-table-column label="实际入库数量" align="center" prop="realQty" width="120" />
<el-table-column label="库位码" align="center" prop="pcode" width="120" />
<el-table-column label="备注" align="center" prop="remark" width="200" />
<el-table-column label="需求方" align="center" prop="demandDeptName" v-if="stockList.length && stockList[0].wlType == 'WZ008'" width="200" />
<el-table-column label="是否移库" align="center" prop="isMove">
<template #default="scope">
<span>{{ isMoveFun(scope.row.hasMoved) }}</span>
@@ -222,6 +228,15 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="上传照片" prop="operator">
<el-select v-model="billData.isUploadPhoto" placeholder="请选择是否上传图片" clearable>
<el-option v-for="dict in uploadPhotoMenu" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="库存状态" prop="execStatus">
@@ -269,7 +284,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="所属仓库" prop="warehouseCode">
<el-cascader :options="warehouseList" @change="pcodeList" v-model="storeData.warehouseCode" :props="{
<el-cascader :options="warehouseList" @change="pcodeList" style="width: 100%;" v-model="storeData.warehouseCode" :props="{
children: 'children',
label: 'warehouseName',
value: 'warehouseCode',
@@ -304,6 +319,15 @@
<el-input v-model="kzms" placeholder="请输入扩展描述" :disabled="idEdit != 0" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="上传照片">
<el-select v-model="storeData.isUploadPhoto" placeholder="请选择" clearable>
<el-option v-for="dict in uploadPhotoMenu" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="18">
</el-col>
<el-col :span="4">
<el-checkbox v-model="autoFill" label="自动填充" size="large" @change="autoFillFun" :disabled="idEdit != 0" />
</el-col>
@@ -400,6 +424,11 @@
<el-input v-model="scope.row.remark" placeholder="请输入备注"></el-input>
</template>
</el-table-column>
<el-table-column label="需求方" align="center" width="200" v-if="storeData.wlType == 'WZ008'">
<template #default="scope">
<el-input v-model="scope.row.demandDeptName" placeholder="请输入需求方"></el-input>
</template>
</el-table-column>
<el-table-column label="采购订单号" align="center" prop="sapNo" width="130">
<template #default="scope">
<el-input v-if="scope.row.isnew" v-model="scope.row.sapNo" placeholder="请输入订单号"></el-input>
@@ -812,11 +841,20 @@ const execStatusMenu = ref([
{ value: "0", label: "预入库" },
{ value: "1", label: "已入库" },
]);
const getExecStatusName = (value) => {
return execStatusMenu.value.find((item) => item.value === value)?.label;
};
// 新增库存状态
const uploadPhotoMenu = ref([
{ value: 0, label: "未上传" },
{ value: 1, label: "已上传" },
]);
const getUploadPhoto = (value) => {
return uploadPhotoMenu.value.find((item) => item.value === value)?.label;
};
//所属仓库
function warehouseFun() {
//所属仓库下拉数据
@@ -1167,6 +1205,7 @@ function submitForm() {
execStatus: storeData.value.execStatus, //是否预入库
id: idEdit.value,
bizType: 0,
isUploadPhoto: storeData.value.isUploadPhoto, //是否上传照片
billNo:
storeData.value.billNo && isSingle.value
? storeData.value.billNo
@@ -1249,6 +1288,7 @@ function editData(row) {
billData.value.operationTime = obj.operationTime;
billData.value.id = obj.id;
billData.value.billNo = obj.billNo;
billData.value.isUploadPhoto = obj.isUploadPhoto;
billData.value.execStatus = obj.execStatus;
openBill.value = true;
}