suojin
/
smartpark_durable_front
25
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修改

Browse Source
master
zhangdi 3 weeks ago
parent 1c606f25fc
commit 9b28c5569d
4 changed files with 481 additions and 452 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/views/firstOrder/components/consumableDialog.vue
  2. 19
      src/views/firstOrder/components/inDialog.vue
  3. 40
      src/views/firstOrder/components/outDialog.vue
  4. 6
      src/views/materials/expend.vue

2
src/views/firstOrder/components/consumableDialog.vue
Unescape View File

@ -27,6 +27,7 @@ export default {
type: String, type: String,
default: '' default: ''
}, },
tableData: { type: Array, default: () => [] },
}, },
data() { data() {
return { return {
@ -175,6 +176,7 @@ export default {
}, },
mounted() { mounted() {
this.consumableVisible = this.consumableVisible this.consumableVisible = this.consumableVisible
this.allSelectedList = this.tableData
}, },
methods: { methods: {
async handleLog(row) { async handleLog(row) {

19
src/views/firstOrder/components/inDialog.vue
Unescape View File

@ -25,12 +25,12 @@
:span="12" :span="12"
v-show="sizeForm.options == 1 && inDialogType != 'add'" v-show="sizeForm.options == 1 && inDialogType != 'add'"
> >
<el-form-item label="入库单号"> <el-form-item label="入库单号：" >
<el-input v-model="sizeForm.orderNo" disabled></el-input> <el-input v-model="sizeForm.orderNo" disabled></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="入库时间"> <el-form-item label="入库时间：">
<el-date-picker <el-date-picker
v-model="sizeForm.inDate" v-model="sizeForm.inDate"
format="yyyy-MM-dd" format="yyyy-MM-dd"
@ -44,7 +44,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="事由"> <el-form-item label="事由：" required>
<el-input <el-input
v-model="sizeForm.reason" v-model="sizeForm.reason"
:disabled="inDialogType == 'details'" :disabled="inDialogType == 'details'"
@ -52,7 +52,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物资类型"> <el-form-item label="物资类型：" required>
<el-select <el-select
v-model="sizeForm.materialType" v-model="sizeForm.materialType"
placeholder="请选择" placeholder="请选择"
@ -65,7 +65,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="source" label="来源"> <el-form-item prop="source" label="来源：" required>
<el-select <el-select
v-model="sizeForm.source" v-model="sizeForm.source"
placeholder="请选择" placeholder="请选择"
@ -78,7 +78,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="选项"> <el-form-item label="选项：" required>
<el-radio-group <el-radio-group
v-model="sizeForm.option" v-model="sizeForm.option"
@change="radioChange()" @change="radioChange()"
@ -90,7 +90,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="sizeForm.option == 1"> <el-col :span="12" v-if="sizeForm.option == 1">
<el-form-item label="采购单名称"> <el-form-item label="采购单名称：">
<el-input v-model="sizeForm.quarterName" disabled></el-input> <el-input v-model="sizeForm.quarterName" disabled></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -829,9 +829,10 @@ export default {
return; return;
} }
if ( if (
row.theInboundQuantity + row.yetInboundQuantity > row.theInboundQuantity>0&&
( row.theInboundQuantity + row.yetInboundQuantity >
row.requiredQuantity && row.requiredQuantity &&
!row.remark !row.remark)
) { ) {
this.$message.warning( this.$message.warning(
row.materialName + row.materialName +

40
src/views/firstOrder/components/outDialog.vue
Unescape View File

@ -4,27 +4,27 @@
:append-to-body="true" width="70%" @close="handleCloseDetail" fullscreen> :append-to-body="true" width="70%" @close="handleCloseDetail" fullscreen>
<!-- 基本信息 --> <!-- 基本信息 -->
<div class="dialog-content"> <div class="dialog-content">
<el-form :model="sizeForm" ref="dynamicValidateForm" label-width="100px" class="demo-dynamic"> <el-form :model="sizeForm" ref="dynamicValidateForm" label-width="110px" class="demo-dynamic">
<div class="form-title">基本信息</div> <div class="form-title">基本信息</div>
<el-row> <el-row>
<el-col :span="12" v-show="sizeForm.options == 1 && outDialogType != 'add'"> <el-col :span="12" v-show="sizeForm.options == 1 && outDialogType != 'add'">
<el-form-item label="出库单号"> <el-form-item label="出库单号：">
<el-input v-model="sizeForm.orderNo" disabled></el-input> <el-input v-model="sizeForm.orderNo" disabled></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="出库申请日期"> <el-form-item label="出库申请日期：">
<el-date-picker v-model="sizeForm.outDate" type="date" placeholder="选择日期" style="width: 100%" disabled> <el-date-picker v-model="sizeForm.outDate" type="date" placeholder="选择日期" style="width: 100%" disabled>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="事由"> <el-form-item label="事由：" required>
<el-input v-model="sizeForm.reason" :disabled="outDialogType == 'details'"></el-input> <el-input v-model="sizeForm.reason" :disabled="outDialogType == 'details'"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物资类型"> <el-form-item label="物资类型：" required>
<el-select v-model="sizeForm.materialType" placeholder="请选择" style="width: 100%" <el-select v-model="sizeForm.materialType" placeholder="请选择" style="width: 100%"
:disabled="outDialogType == 'details'"> :disabled="outDialogType == 'details'">
<el-option label="办公室物资" value="1"></el-option> <el-option label="办公室物资" value="1"></el-option>
@ -33,7 +33,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="选项"> <el-form-item label="选项：" required>
<el-radio-group v-model="sizeForm.options" @change="radioChange()" <el-radio-group v-model="sizeForm.options" @change="radioChange()"
:disabled="outDialogType == 'details'"> :disabled="outDialogType == 'details'">
<el-radio :label="1" :disabled="sizeForm.type == 2"><span>批量选择</span></el-radio> <el-radio :label="1" :disabled="sizeForm.type == 2"><span>批量选择</span></el-radio>
@ -42,7 +42,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="sizeForm.options === 2"> <el-col :span="12" v-if="sizeForm.options === 2">
<el-form-item label="选项"> <el-form-item label="选项：" required>
<el-radio-group v-model="sizeForm.optionType" :disabled="outDialogType == 'details'" <el-radio-group v-model="sizeForm.optionType" :disabled="outDialogType == 'details'"
@change="getMaterialList"> @change="getMaterialList">
<el-radio label="YH">易耗品</el-radio> <el-radio label="YH">易耗品</el-radio>
@ -51,12 +51,12 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="sizeForm.options == 1"> <el-col :span="12" v-if="sizeForm.options == 1">
<el-form-item label="需求单名称"> <el-form-item label="需求单名称：">
<el-input v-model="sizeForm.demandEndInfo" disabled></el-input> <el-input v-model="sizeForm.demandEndInfo" disabled></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="outDialogTiltle == '详情'"> <el-col :span="12" v-if="outDialogTiltle == '详情'">
<el-form-item label="状态"> <el-form-item label="状态：">
<span v-if="rowItem.status == 1">暂存</span> <span v-if="rowItem.status == 1">暂存</span>
<span v-if="rowItem.status == 2">待二级库入库</span> <span v-if="rowItem.status == 2">待二级库入库</span>
<span v-if="rowItem.status == 3">已出库</span> <span v-if="rowItem.status == 3">已出库</span>
@ -267,7 +267,7 @@
<!-- 单条新增耐用品弹窗 --> <!-- 单条新增耐用品弹窗 -->
<consumableDialog v-if="consumableVisible" :consumableVisible="consumableVisible" <consumableDialog v-if="consumableVisible" :consumableVisible="consumableVisible"
:demandDialogTitle="demandDialogTitle" @handleCloseDetail="closeDialog" @confirm="confirm"> :demandDialogTitle="demandDialogTitle" :tableData="sizeForm.inTableData" @handleCloseDetail="closeDialog" @confirm="confirm">
</consumableDialog> </consumableDialog>
<!-- 批量耐用品弹窗 --> <!-- 批量耐用品弹窗 -->
<batchSelectionDialog v-if="batchSelectionVisible" :batchSelectionVisible="batchSelectionVisible" <batchSelectionDialog v-if="batchSelectionVisible" :batchSelectionVisible="batchSelectionVisible"
@ -544,7 +544,16 @@ inTableAdd() {
return; return;
} }
} }
if (
this.sizeForm.optionType === "NY" &&
this.outDialogType !== "details"
) {
this.consumableVisible = true;
} else {
this.sizeForm.inTableData.push({}); this.sizeForm.inTableData.push({});
}
}, },
addInit() { addInit() {
this.sizeForm.outDate = new Date(); //出库时间 this.sizeForm.outDate = new Date(); //出库时间
@ -734,6 +743,17 @@ getDepartmentName(departmentId) {
async getMaterialList() { async getMaterialList() {
this.loading = true; this.loading = true;
this.consumableVisible = false; this.consumableVisible = false;
this.sizeForm.inTableData = [];
this.statisticsList = [];
// this.sizeForm.optionType = "";
this.inBatchDialogVisible = false;
this.consumableVisible = false;
this.inBatchDialogVisible = false;
this.batchSelectionVisible = false;
this.batchTableData = [];
// this.inBatchForm.batchType = ""
// this.inBatchForm.department = ""
this.sizeForm.demandEndInfo = "";
try { try {
if ( if (
this.sizeForm.optionType === "NY" && this.sizeForm.optionType === "NY" &&

6
src/views/materials/expend.vue
Unescape View File

@ -191,6 +191,12 @@ export default {
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
}, },
{
label: "使用人",
prop: "proposerName",
headerAlign: "center",
align: "center",
},
{ {
label: "归还时间", label: "归还时间",
prop: "returnTime", prop: "returnTime",

Write Preview
Loading…
Cancel
Save