|
|
@@ -169,7 +169,7 @@
|
|
|
<el-input v-else v-model="row.num" type="number" />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
+<!-- <el-table-column
|
|
|
label="实际接收"
|
|
|
align="receiveNum"
|
|
|
v-if="form.state === '6' || form.state === '8'"
|
|
|
@@ -177,7 +177,7 @@
|
|
|
<template v-slot="{ row }">
|
|
|
<el-text>{{ row.receiveNum }}</el-text>
|
|
|
</template>
|
|
|
- </el-table-column>
|
|
|
+ </el-table-column>-->
|
|
|
<el-table-column
|
|
|
label="操作"
|
|
|
align="remark"
|
|
|
@@ -205,7 +205,7 @@
|
|
|
>
|
|
|
<!-- <el-col :span="2" ><el-text tag="p">会签:</el-text></el-col>
|
|
|
<el-col :span="4" ><el-text tag="p" >{{form.countersignUser}}</el-text></el-col>-->
|
|
|
- <el-col :span="2"><el-text tag="p">批准:</el-text></el-col>
|
|
|
+ <el-col :span="2"><el-text tag="p">出库人:</el-text></el-col>
|
|
|
<el-col :span="4"
|
|
|
><el-text tag="p">{{ form.approveUser }}</el-text></el-col
|
|
|
>
|
|
|
@@ -426,7 +426,7 @@
|
|
|
:type="form.state > 5 ? 'success' : 'primary'"
|
|
|
>
|
|
|
<el-card>
|
|
|
- <h4>批准</h4>
|
|
|
+ <h4>出库</h4>
|
|
|
<el-form
|
|
|
v-if="form.state >= 5"
|
|
|
size="small"
|
|
|
@@ -437,27 +437,21 @@
|
|
|
<el-form-item label="审批人" v-if="form.state > 5">
|
|
|
<el-text tag="p">{{ form.approve.user }}</el-text>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="审批结果">
|
|
|
+ <el-form-item label="出库结果">
|
|
|
<el-text
|
|
|
tag="p"
|
|
|
v-if="dialogType === 1 || form.state > 5"
|
|
|
>{{
|
|
|
form.state === "5"
|
|
|
- ? "待审批"
|
|
|
- : form.state > 5
|
|
|
- ? "通过"
|
|
|
- : "未通过"
|
|
|
+ ? "待出库"
|
|
|
+ : "已出库"
|
|
|
}}</el-text
|
|
|
>
|
|
|
<el-text tag="p" v-else-if="form.approveUser !== username"
|
|
|
- >待审批</el-text
|
|
|
+ >待出库</el-text
|
|
|
>
|
|
|
- <el-radio-group v-else v-model="form.approveState">
|
|
|
- <el-radio :value="0">通过</el-radio>
|
|
|
- <el-radio :value="1">不通过</el-radio>
|
|
|
- </el-radio-group>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="审批时间" v-if="form.state > 5">
|
|
|
+ <el-form-item label="出库时间" v-if="form.state > 5">
|
|
|
<el-text tag="p">{{ form.approve.time }}</el-text>
|
|
|
</el-form-item>
|
|
|
<el-form-item style="margin-left: 35%">
|
|
|
@@ -469,7 +463,7 @@
|
|
|
form.state === '5' &&
|
|
|
form.approveUser === username
|
|
|
"
|
|
|
- >审 核</el-button
|
|
|
+ >已 出 库</el-button
|
|
|
>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
@@ -578,7 +572,7 @@ const saveForm = (type) => {
|
|
|
if (type === 2) {
|
|
|
if (form.value.auditState != undefined) {
|
|
|
if (form.value.auditState === 0 && !form.value.approveUser) {
|
|
|
- ElMessage.error("审批人员不能为空");
|
|
|
+ ElMessage.error("出库不能为空");
|
|
|
return;
|
|
|
}
|
|
|
} else {
|
|
|
@@ -605,11 +599,7 @@ const saveForm = (type) => {
|
|
|
}*/
|
|
|
if (type === 4) {
|
|
|
step = "approve";
|
|
|
- if (form.value.approveState === undefined) {
|
|
|
- ElMessage.error("请选择处理结果");
|
|
|
- return;
|
|
|
- }
|
|
|
- state = form.value.approveState;
|
|
|
+ state = 0;
|
|
|
}
|
|
|
const params = {
|
|
|
id: form.value.id,
|
|
|
@@ -755,7 +745,7 @@ option.value = Object.assign(option.value, {
|
|
|
prop: "countersignUser",
|
|
|
},*/
|
|
|
{
|
|
|
- label: "审批人员",
|
|
|
+ label: "出库人员",
|
|
|
width: 150,
|
|
|
overHidden: true,
|
|
|
prop: "approveUser",
|
qinhb