|
|
@@ -339,6 +339,14 @@
|
|
|
v-hasPermi="['warehouseBusiness:warehousebills:remove']"
|
|
|
>删除
|
|
|
</el-button>
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-delete"
|
|
|
+ v-if="scope.row.fBillstatus == 4"
|
|
|
+ @click="handleUpdate(scope.row, true)"
|
|
|
+ >审核进度
|
|
|
+ </el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -1968,6 +1976,7 @@
|
|
|
@click="submitForm(6)"
|
|
|
>请核</el-button>
|
|
|
<el-button type="danger" v-if="form.fBillstatus == '6'" @click="revoke">撤销请核</el-button>
|
|
|
+ <el-button type="danger" v-if="form.fBillstatus == '4' && current == before" @click="revokeTwo">撤销请核</el-button>
|
|
|
<el-button @click="cancelTwo" v-if="approVal === true">取 消</el-button>
|
|
|
<el-button @click="cancel" v-else>取 消</el-button>
|
|
|
</div>
|
|
|
@@ -2731,6 +2740,8 @@ export default {
|
|
|
{ dictLabel: "尺码", dictValue: "4" },
|
|
|
{ dictLabel: "固定", dictValue: "5" },
|
|
|
],
|
|
|
+ current:'',
|
|
|
+ before:'',
|
|
|
// 查询参数
|
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
|
@@ -3012,6 +3023,12 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ revokeTwo(){
|
|
|
+ queryUserVal().then((response)=>{
|
|
|
+ this.current = response.user.userName
|
|
|
+ this.before = queryParams.createBy
|
|
|
+ })
|
|
|
+ },
|
|
|
printSomething() {
|
|
|
// 此处的style即为打印时的样式
|
|
|
const style =
|
caojunjie