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

Compare commits

base: suojin:dc82bab824073c99217519739e38f112520499fa
Branches Tags
suojin:main
suojin:master
..
compare: suojin:2a1e57afbddc951b0918c0795fa29b046d7a09bc
Branches Tags
suojin:main
suojin:master

No commits in common. 'dc82bab824073c99217519739e38f112520499fa' and '2a1e57afbddc951b0918c0795fa29b046d7a09bc' have entirely different histories.
dc82bab824 ... 2a1e57afbd

9 changed files with 123 additions and 159 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
  1. 6
      src/views/firstOrder/components/approvalProcessDialog.vue
  2. 63
      src/views/firstOrder/components/inDialog.vue
  3. 84
      src/views/firstOrder/components/outDialog.vue
  4. 1
      src/views/firstOrder/inbound.vue
  5. 12
      src/views/firstOrder/list.vue
  6. 7
      src/views/firstOrder/outbound.vue
  7. 60
      src/views/materials/index.vue
  8. 9
      src/views/secondOrder/components/approvalProcessDialog.vue
  9. 38
      src/views/secondOrder/outbound.vue

6
src/views/firstOrder/components/approvalProcessDialog.vue
Unescape View File

@ -92,7 +92,7 @@ export default {
margin: 0 auto 0 margin: 0 auto 0
} }
// :deep(.el-dialog__body) { :deep(.el-dialog__body) {
// height: 300px; height: 300px;
// } }
</style> </style>

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

@ -91,24 +91,16 @@
</el-table-column> </el-table-column>
<el-table-column prop="theInboundQuantity" label="本次入库数量"> <el-table-column prop="theInboundQuantity" label="本次入库数量">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number size="mini" v-model="scope.row.theInboundQuantity" :min="0" style="width: 100%;" <el-input-number size="mini" v-model="scope.row.theInboundQuantity" :min="1" style="width: 100%;"
@change="syncInboundQuantity(scope.row)" v-if='inDialogType != "details"'></el-input-number> @change="syncInboundQuantity(scope.row)" v-if='inDialogType != "details"'></el-input-number>
<span v-else>{{ scope.row.theInboundQuantity === undefined ? 0 : scope.row.theInboundQuantity }}</span> <span v-else>{{ scope.row.theInboundQuantity || 0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="unitPrice" label="单价"> <el-table-column prop="unitPrice" label="单价">
<template slot-scope="scope">
<el-input-number size="mini" v-model="scope.row.unitPrice" :min="0" style="width: 100%;"
@change="syncUnitPrice(scope.row)"
v-if='inDialogType != "details" && scope.row.type !== "YH"'></el-input-number>
<span v-else-if='scope.row.type === "YH"'>-</span>
<span v-else>{{ scope.row.unitPrice || 0 }}</span>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 单项选择 --> <!-- 单项选择 -->
<el-table :data="sizeForm.singleData" border style="width: 100%" v-show="sizeForm.option == 2" align="center"> <el-table :data="sizeForm.singleData" border style="width: 100%" v-show="sizeForm.option == 2">
<el-table-column prop="materialCode" label="物资编码"></el-table-column> <el-table-column prop="materialCode" label="物资编码"></el-table-column>
<el-table-column prop="materialName" label="物资名称"> <el-table-column prop="materialName" label="物资名称">
<template slot-scope="scope"> <template slot-scope="scope">
@ -142,7 +134,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="theInboundQuantity" label="本次入库数量"> <el-table-column prop="theInboundQuantity" label="本次入库数量">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number size="mini" v-model="scope.row.theInboundQuantity" :min="0" style="width: 100%;" <el-input-number size="mini" v-model="scope.row.theInboundQuantity" :min="1" style="width: 100%;"
@change="syncInboundQuantity(scope.row)" v-if='inDialogType != "details"'></el-input-number> @change="syncInboundQuantity(scope.row)" v-if='inDialogType != "details"'></el-input-number>
<span v-else>{{ scope.row.theInboundQuantity || 0 }}</span> <span v-else>{{ scope.row.theInboundQuantity || 0 }}</span>
</template> </template>
@ -150,9 +142,7 @@
<el-table-column prop="unitPrice" label="单价"> <el-table-column prop="unitPrice" label="单价">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number size="mini" v-model="scope.row.unitPrice" :min="0" style="width: 100%;" <el-input-number size="mini" v-model="scope.row.unitPrice" :min="0" style="width: 100%;"
@change="syncUnitPrice(scope.row)" @change="syncUnitPrice(scope.row)" v-if='inDialogType != "details"'></el-input-number>
v-if='inDialogType != "details" && scope.row.type !== "YH"'></el-input-number>
<span v-else-if='scope.row.type === "YH"'>-</span>
<span v-else>{{ scope.row.unitPrice || 0 }}</span> <span v-else>{{ scope.row.unitPrice || 0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
@ -184,20 +174,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="unitPrice" label="单价"> <el-table-column prop="unitPrice" label="单价">
<template slot-scope="scope">
<span v-if='scope.row.type === "YH"'>-</span>
<span v-else>{{ scope.row.unitPrice || 0 }}</span>
</template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column prop="date" label="入库信息"> <el-table-column prop="date" label="入库信息">
<el-table-column prop="theInboundQuantity" label="数量"> <el-table-column prop="theInboundQuantity" label="数量">
</el-table-column> </el-table-column>
<el-table-column prop="unitPrice" label="单价"> <el-table-column prop="unitPrice" label="单价">
<template slot-scope="scope">
<span v-if='scope.row.type === "YH"'>-</span>
<span v-else>{{ scope.row.unitPrice || 0 }}</span>
</template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column prop="date" label="入库后库存"> <el-table-column prop="date" label="入库后库存">
@ -207,10 +189,6 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="unitPrice" label="单价"> <el-table-column prop="unitPrice" label="单价">
<template slot-scope="scope">
<span v-if='scope.row.type === "YH"'>-</span>
<span v-else>{{ scope.row.unitPrice || 0 }}</span>
</template>s
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column prop="date" label="入库信息"> <el-table-column prop="date" label="入库信息">
@ -242,10 +220,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="unit" label="单位"></el-table-column> <el-table-column prop="unit" label="单位"></el-table-column>
<el-table-column prop="inboundQuantity" label="数量">
</el-table-column>
<el-table-column prop="unitPrice" label="单价"> <el-table-column prop="unitPrice" label="单价">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if='scope.row.type === "YH"'>-</span> {{ scope.row.unitPrice || 0 }}
<span v-else>{{ scope.row.unitPrice || 0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@ -254,8 +233,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="unitPrice" label="单价"> <el-table-column prop="unitPrice" label="单价">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if='scope.row.type === "YH"'>-</span> {{ scope.row.unitPrice }}
<span v-else>{{ scope.row.unitPrice || 0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@ -267,8 +245,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="unitPrice" label="单价"> <el-table-column prop="unitPrice" label="单价">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if='scope.row.type === "YH"'>-</span> {{ scope.row.unitPrice || 0 }}
<span v-else>{{ scope.row.unitPrice || 0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@ -458,7 +435,6 @@ export default {
// const randomNum = Math.floor(Math.random() * 100000000) + 1; // const randomNum = Math.floor(Math.random() * 100000000) + 1;
// this.sizeForm.orderNo = String(randomNum).padStart(8, '0');//入库单号 // this.sizeForm.orderNo = String(randomNum).padStart(8, '0');//入库单号
this.sizeForm.inDate = new Date()//入库时间 this.sizeForm.inDate = new Date()//入库时间
this.sizeForm.inTableData.theInboundQuantity = 0
}, },
//取消操作 //取消操作
handleCloseDetail() { handleCloseDetail() {
@ -474,7 +450,7 @@ export default {
status: '',// status: '',//
materialId: '', materialId: '',
materialName: '', materialName: '',
theInboundQuantity: 0, theInboundQuantity: 1,
unitPrice: 0, unitPrice: 0,
}) })
} else { } else {
@ -489,7 +465,7 @@ export default {
status: '',// status: '',//
materialId: '', materialId: '',
materialName: '', materialName: '',
theInboundQuantity: 0, theInboundQuantity: 1,
unitPrice: 0, unitPrice: 0,
}; };
this.sizeForm.singleData.push(newRow); this.sizeForm.singleData.push(newRow);
@ -588,8 +564,8 @@ export default {
this.$message.error("物资名称不能为空"); this.$message.error("物资名称不能为空");
return; return;
} }
if (!row.theInboundQuantity || row.theInboundQuantity < 0) { if (!row.theInboundQuantity || row.theInboundQuantity <= 0) {
this.$message.error("本次入库数量不能为空"); this.$message.error("本次入库数量必须大于0");
return; return;
} }
if (row.unitPrice === undefined || row.unitPrice < 0) { if (row.unitPrice === undefined || row.unitPrice < 0) {
@ -618,8 +594,8 @@ export default {
this.$message.error("物资名称不能为空"); this.$message.error("物资名称不能为空");
return; return;
} }
if (!row.theInboundQuantity || row.theInboundQuantity < 0) { if (!row.theInboundQuantity || row.theInboundQuantity <= 0) {
this.$message.error("本次入库数量不能为空"); this.$message.error("本次入库数量必须大于0");
return; return;
} }
if (row.unitPrice === undefined || row.unitPrice <= 0) { if (row.unitPrice === undefined || row.unitPrice <= 0) {
@ -677,7 +653,7 @@ export default {
// type类别选择变更 // type类别选择变更
handleTypeChange(row) { handleTypeChange(row) {
if (row.type === 'YH') { if (row.type === 'YH') {
// row.unitPrice = null; // 检查单价是否大于600
if (Number(row.unitPrice) > 600) { if (Number(row.unitPrice) > 600) {
this.$confirm('单价大于600元,确定要选择为易耗品吗？', '提示', { this.$confirm('单价大于600元,确定要选择为易耗品吗？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
@ -705,9 +681,4 @@ export default {
font-weight: 600; font-weight: 600;
padding: 18px 0; padding: 18px 0;
} }
::v-deep .el-table td,
::v-deep .el-table th {
text-align: center !important;
}
</style> </style>

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

@ -39,15 +39,6 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="sizeForm.options === 2">
<el-form-item label="选项">
<el-radio-group v-model="sizeForm.radio" :disabled="outDialogType == 'details'">
<el-radio :label="1">易耗品</el-radio>
<el-radio :label="2">耐用品</el-radio>
<el-radio :label="3">全部</el-radio>
</el-radio-group>
</el-form-item>
</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>
@ -78,11 +69,6 @@
{{ scope.row.type === "NY" ? "耐用品" : (scope.row.type === "YH" ? "易耗品" : "") }} {{ scope.row.type === "NY" ? "耐用品" : (scope.row.type === "YH" ? "易耗品" : "") }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="type" label="出库类型">
<template slot-scope="scope">
{{ scope.row.type === "NY" ? "出库单" : (scope.row.type === "YH" ? "发放单" : "") }}
</template>
</el-table-column>
<el-table-column prop="unit" label="单位"> <el-table-column prop="unit" label="单位">
</el-table-column> </el-table-column>
<el-table-column prop="departmentName" label="部门" v-if="sizeForm.options === 2"> <el-table-column prop="departmentName" label="部门" v-if="sizeForm.options === 2">
@ -105,11 +91,17 @@
</el-table-column> </el-table-column>
<el-table-column prop="theOutboundQuantity" label="本次出库数量"> <el-table-column prop="theOutboundQuantity" label="本次出库数量">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number size="mini" v-model="scope.row.theOutboundQuantity" :min="0" style="width: 100%;" <el-input-number size="mini" v-model="scope.row.theOutboundQuantity" :min="1" style="width: 100%;"
@change="syncInboundQuantity(scope.row)" :disabled="outDialogType == 'details'"></el-input-number> @change="syncInboundQuantity(scope.row)" :disabled="outDialogType == 'details'"></el-input-number>
<!-- <span v-else>{{ scope.row.theOutboundQuantity || 0 }}</span> --> <!-- <span v-else>{{ scope.row.theOutboundQuantity || 0 }}</span> -->
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="status" label="出库情况">
<template slot-scope="scope">
<el-button type="text" @click="putIn(scope.row)" v-if="scope.row.status == 1">出库</el-button>
<span v-if="scope.row.status == 0">已出库</span>
</template>
</el-table-column> -->
</el-table> </el-table>
<div class="form-title" v-if="outDialogType !== 'details'">出库账目表格：</div> <div class="form-title" v-if="outDialogType !== 'details'">出库账目表格：</div>
<el-table :data="sizeForm.inTableData" border style="width: 100%" v-if="outDialogType !== 'details'"> <el-table :data="sizeForm.inTableData" border style="width: 100%" v-if="outDialogType !== 'details'">
@ -125,11 +117,6 @@
{{ scope.row.type === "NY" ? "耐用品" : (scope.row.type === "YH" ? "易耗品" : "") }} {{ scope.row.type === "NY" ? "耐用品" : (scope.row.type === "YH" ? "易耗品" : "") }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="type" label="出库类型">
<template slot-scope="scope">
{{ scope.row.type === "NY" ? "出库单" : (scope.row.type === "YH" ? "发放单" : "") }}
</template>
</el-table-column>
<el-table-column prop="departmentName" label="部门" v-if="sizeForm.options == 2"> <el-table-column prop="departmentName" label="部门" v-if="sizeForm.options == 2">
<template slot-scope="scope"> <template slot-scope="scope">
<span> <span>
@ -143,10 +130,14 @@
<el-table-column prop="date" label="出库信息" v-if="sizeForm.options == 1"> <el-table-column prop="date" label="出库信息" v-if="sizeForm.options == 1">
<el-table-column prop="outboundQuantity" label="数量"> <el-table-column prop="outboundQuantity" label="数量">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.outboundQuantity || 0 }} {{ scope.row.outboundQuantity || 0 }}
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="date" label="出库后库存" v-if="sizeForm.options == 1">
<el-table-column prop="str10" label="数量">
</el-table-column>
</el-table-column> -->
</el-table> </el-table>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
@ -179,15 +170,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-form-item label="选项">
<el-radio-group v-model="sizeForm.radio" :disabled="outDialogType == 'details'">
<el-radio :label="1">易耗品</el-radio>
<el-radio :label="2">耐用品</el-radio>
<el-radio :label="3">全部</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
@ -224,12 +206,12 @@
{{ scope.row.outboundQuantity || 0 }} {{ scope.row.outboundQuantity || 0 }}
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="theOutboundQuantity" label="本次出库数量"> <el-table-column prop="theOutboundQuantity" label="本次出库数量">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number size="mini" v-model="scope.row.theOutboundQuantity" :min="1" style="width: 100%;" <el-input-number size="mini" v-model="scope.row.theOutboundQuantity" :min="1" style="width: 100%;"
@change="syncInboundQuantity(scope.row)" :disabled="outDialogType == 'details'"></el-input-number> @change="syncInboundQuantity(scope.row)" :disabled="outDialogType == 'details'"></el-input-number>
</template> </template>
</el-table-column> --> </el-table-column>
</el-table> </el-table>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
@ -277,9 +259,8 @@ export default {
inTableData: [], inTableData: [],
ldOneOutStorageDetailVOList: [], ldOneOutStorageDetailVOList: [],
demandEndInfo: '',//需求单名称 demandEndInfo: '',//需求单名称
outDate: '',//出库时间 outDate: '',//出库日期
options: 2,//出库类型 options: 2,//出库类型
radio: 1, // 1易耗品 2耐用品
materialType: '1',//物资类型 materialType: '1',//物资类型
status: '',//1暂存 2提交 status: '',//1暂存 2提交
// materialld: '',//物资Id // materialld: '',//物资Id
@ -288,6 +269,7 @@ export default {
name: "用户名称" name: "用户名称"
}, },
}, },
uniqueListDialogVisible: false, // 新增：控制弹窗显示
uniqueList: [], uniqueList: [],
goodsList: [], goodsList: [],
goodsSelectList: [], goodsSelectList: [],
@ -307,11 +289,8 @@ export default {
const now = new Date() const now = new Date()
const year = now.getFullYear(); const year = now.getFullYear();
const month = String(now.getMonth() + 1).padStart(2, '0'); const month = String(now.getMonth() + 1).padStart(2, '0');
const day = String(now.getDate()).padStart(2, '0') const day = String(now.getDate()).padStart(2, '0');
const hour = String(now.getHours()).padStart(2, '0') return `${year}年${month}月${day}日`;
const minute = String(now.getMinutes()).padStart(2, '0')
const second = String(now.getSeconds()).padStart(2, '0')
return `${year}-${month}-${day} ${hour}:${minute}:${second}`
} }
}, },
mounted() { mounted() {
@ -325,9 +304,6 @@ export default {
this.getMaterialList() this.getMaterialList()
}, },
methods: { methods: {
addInit() {
this.sizeForm.outDate = new Date()//出库时间
},
//本次出库数量 //本次出库数量
syncInboundQuantity(row) { syncInboundQuantity(row) {
row.theOutboundQuantity = Number(row.theOutboundQuantity); row.theOutboundQuantity = Number(row.theOutboundQuantity);
@ -401,12 +377,12 @@ export default {
}) })
if (res.data && res.data.result) { if (res.data && res.data.result) {
this.sizeForm.inTableData = res.data.result.uniqueList this.sizeForm.inTableData = res.data.result.duplicateList
const selectedDept = this.departmentList.find( const selectedDept = this.departmentList.find(
dept => dept.departmentId === this.inBatchForm.department dept => dept.departmentId === this.inBatchForm.department
); );
const deptName = selectedDept ? selectedDept.department : ''; const deptName = selectedDept ? selectedDept.department : '';
this.sizeForm.inTableData = res.data.result.uniqueList.map(item => ({ this.sizeForm.inTableData = res.data.result.duplicateList.map(item => ({
...item, ...item,
IdDemandEndld: this.inBatchForm.batchType, IdDemandEndld: this.inBatchForm.batchType,
// department: this.inBatchForm.department, // department: this.inBatchForm.department,
@ -419,14 +395,10 @@ export default {
if (selectedQuarter) { if (selectedQuarter) {
this.sizeForm.demandEndInfo = selectedQuarter.quarterName; this.sizeForm.demandEndInfo = selectedQuarter.quarterName;
} }
//当radio是全部的时候 弹弹窗 if (res.data.result.uniqueList != null && res.data.result.uniqueList.length > 0) {
if (this.sizeForm.radio === 3) { this.goodsVisible = true
if (res.data.result.duplicateList != null && res.data.result.duplicateList.length > 0) { this.goodsList = res.data.result.uniqueList
this.goodsVisible = true
this.goodsList = res.data.result.duplicateList
}
} }
} else { } else {
this.$message.warning('未获取到详细数据'); this.$message.warning('未获取到详细数据');
} }
@ -544,6 +516,7 @@ export default {
try { try {
const res = await editList(this.id); const res = await editList(this.id);
const { ldOneOutStorage, ldOneOutStorageDetails = [] } = res.data.result || {}; const { ldOneOutStorage, ldOneOutStorageDetails = [] } = res.data.result || {};
if (!ldOneOutStorage) { if (!ldOneOutStorage) {
this.$message.error("回显数据异常"); this.$message.error("回显数据异常");
return; return;
@ -561,18 +534,20 @@ export default {
this.sizeForm.inTableData = handledDetailList; this.sizeForm.inTableData = handledDetailList;
} catch (error) { } catch (error) {
console.error("回显失败：", error);
this.$message.error("获取详情数据失败"); this.$message.error("获取详情数据失败");
} }
} }
}, },
addInit() {
this.sizeForm.outDate = new Date()//出库时间
},
// 添加出库数据 // 添加出库数据
inTableAdd() { inTableAdd() {
this.sizeForm.inTableData.push({}) this.sizeForm.inTableData.push({})
}, },
// 选项选择 // 选项选择
async radioChange() { async radioChange() {
// this.resetAllForms()
this.sizeForm.inTableData = [] this.sizeForm.inTableData = []
if (this.sizeForm.options === 1) { if (this.sizeForm.options === 1) {
await this.getQuarterList() await this.getQuarterList()
@ -581,7 +556,6 @@ export default {
} }
}, },
}, },
watch: { watch: {
// 监听需求单选择变化 // 监听需求单选择变化

1
src/views/firstOrder/inbound.vue
Unescape View File

@ -73,7 +73,6 @@
v-if="approvalProcessShow" v-if="approvalProcessShow"
@closeDialog="closeDialog" @closeDialog="closeDialog"
:approveList="approveList" :approveList="approveList"
:id="id"
></approvalProcessDialog> ></approvalProcessDialog>
</basic-container> </basic-container>
</template> </template>

12
src/views/firstOrder/list.vue
Unescape View File

@ -11,9 +11,8 @@
</template> </template>
</avue-crud> </avue-crud>
</basic-container> </basic-container>
<!-- 记录弹窗 -->
<el-dialog title="记录" :visible.sync="dialogLogVisible" width="50%" :close-on-click-modal="false" <el-dialog title="记录" :visible.sync="dialogLogVisible" width="50%" :close-on-click-modal="false"
:append-to-body="true" > :append-to-body="true">
<el-tabs v-model="transactionType" @tab-click="handleTabClick"> <el-tabs v-model="transactionType" @tab-click="handleTabClick">
<el-tab-pane label="出库" name="1"></el-tab-pane> <el-tab-pane label="出库" name="1"></el-tab-pane>
<el-tab-pane label="入库" name="2"></el-tab-pane> <el-tab-pane label="入库" name="2"></el-tab-pane>
@ -22,11 +21,11 @@
<el-table-column type="index" width="50"> </el-table-column> <el-table-column type="index" width="50"> </el-table-column>
<el-table-column prop="quantity" label="数量"> <el-table-column prop="quantity" label="数量">
</el-table-column> </el-table-column>
<el-table-column prop="money" label="单价" v-if="transactionType == '2' && currentRow.type === 'NY'"> <el-table-column prop="money" label="单价" v-if="transactionType == '2'">
</el-table-column> </el-table-column>
<el-table-column prop="operatorName" label="操作人" > <el-table-column prop="operatorName" label="操作人" >
</el-table-column> </el-table-column>
<el-table-column prop="operationTime" label="时间" :formatter="formatTime" width="180"> <el-table-column prop="operationTime" label="时间" :formatter="formatTime">
</el-table-column> </el-table-column>
<el-table-column prop="departmentName" label="部门"> </el-table-column> <el-table-column prop="departmentName" label="部门"> </el-table-column>
</el-table> </el-table>
@ -35,7 +34,11 @@
</template> </template>
<script> <script>
// import { getList, remove } from "@/api/report/report";
import { getList, recordList } from "@/api/firstOrder/list"; import { getList, recordList } from "@/api/firstOrder/list";
import { mapGetters } from "vuex";
export default { export default {
data() { data() {
return { return {
@ -158,6 +161,7 @@ export default {
}; };
}, },
computed: { computed: {
...mapGetters(["userInfo", "permission"]),
permissionList() { permissionList() {
return { return {
addBtn: false, addBtn: false,

7
src/views/firstOrder/outbound.vue
Unescape View File

@ -102,13 +102,6 @@ export default {
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
}, },
{
label: "出库类型",
prop: "outType",
width: 140,
headerAlign: "center",
align: "center",
},
{ {
label: "出库日期", label: "出库日期",
prop: "outDate", prop: "outDate",

60
src/views/materials/index.vue
Unescape View File

@ -3,17 +3,17 @@
<basic-container> <basic-container>
<avue-crud :option="option" v-model="form" :data="data" @row-del="rowDel" @on-load="onLoad" <avue-crud :option="option" v-model="form" :data="data" @row-del="rowDel" @on-load="onLoad"
:table-loading="loading" @row-update="rowUpdate" @row-save="rowSave" @search-change="searchChange" :table-loading="loading" @row-update="rowUpdate" @row-save="rowSave" @search-change="searchChange"
@search-reset="searchReset" :page.sync="page"> @search-reset="searchReset" :page.sync="page"></avue-crud>
</avue-crud>
</basic-container> </basic-container>
</div> </div>
</template> </template>
<script> <script>
import { mapGetters } from "vuex";
import { getList, add, remove, update, getCode } from "@/api/materials/list"; import { getList, add, remove, update, getCode } from "@/api/materials/list";
export default { export default {
data() { data() {
return { return {
form: { imageUrl: "" }, form: {},
selectionList: [], selectionList: [],
query: {}, query: {},
loading: true, loading: true,
@ -95,33 +95,6 @@ export default {
return value; return value;
} }
}, },
{
label: '图片',
prop: 'picture',
type: 'upload',
headerAlign: "center",
align: "center",
loadText: "图片上传中，请稍等",
span: 12,
// propsHttp: { //配置请求接口返回的数据结构
// url: 'picture', //路径地址
// name: 'name', //图片名称
// res: 'data' //返回数据层级结构
// },
tip: "只能上传jpg/png文件",
rules: [{
required: true,
message: "请上传图片",
trigger: "change",
}],
formatter: (row, column) => {
const value = row.picture;
if (value === null || value === undefined || value === "") {
return "无"
}
return value;
}
},
], ],
}, },
data: [], data: [],
@ -130,6 +103,24 @@ export default {
tableData: [], tableData: [],
}; };
}, },
computed: {
...mapGetters(["userInfo", "permission"]),
permissionList() {
return {
addBtn: false,
viewBtn: false,
delBtn: false,
editBtn: false,
};
},
ids() {
let ids = [];
this.selectionList.forEach((ele) => {
ids.push(ele.id);
});
return ids.join(",");
},
},
mounted() { mounted() {
this.tableData = this.ckTable; this.tableData = this.ckTable;
this.fetchMaterialCode(); this.fetchMaterialCode();
@ -197,7 +188,14 @@ export default {
}, },
//新增 //新增
rowSave(row, done, loading) { rowSave(row, done, loading) {
// const submitData = {
// ...row,
// code: row.materialCode,
// materialCode: undefined
// };
// console.log(submitData,'submitData')
add(row).then( add(row).then(
() => { () => {
this.onLoad(this.page); this.onLoad(this.page);
this.$message({ this.$message({
@ -217,6 +215,7 @@ export default {
update(row).then( update(row).then(
() => { () => {
this.onLoad(this.page); this.onLoad(this.page);
this.$message({ this.$message({
type: "success", type: "success",
message: "操作成功!", message: "操作成功!",
@ -229,6 +228,7 @@ export default {
} }
); );
}, },
//删除 //删除
rowDel(row, index, done) { rowDel(row, index, done) {
this.$confirm("确定将选择数据删除?", { this.$confirm("确定将选择数据删除?", {

9
src/views/secondOrder/components/approvalProcessDialog.vue
Unescape View File

@ -15,6 +15,9 @@
:description="item.optTime || ''" :description="item.optTime || ''"
></el-step> ></el-step>
</el-steps> </el-steps>
<!-- <span slot="footer" class="dialog-footer">
<el-button @click="handleCloseDetail()">取 消</el-button>
</span> -->
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -82,7 +85,7 @@ export default {
.teps-con { .teps-con {
margin: 0 auto 0; margin: 0 auto 0;
} }
// :deep(.el-dialog__body) { :deep(.el-dialog__body) {
// height: 300px; height: 300px;
// } }
</style> </style>

38
src/views/secondOrder/outbound.vue
Unescape View File

@ -1,10 +1,23 @@
<template> <template>
<basic-container> <basic-container>
<avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form" :page.sync="page" <avue-crud
:permission="permissionList" @search-change="searchChange" @search-reset="searchReset" :option="option"
@current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"> :table-loading="loading"
:data="data"
ref="crud"
v-model="form"
:page.sync="page"
:permission="permissionList"
@search-change="searchChange"
@search-reset="searchReset"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
>
<template slot-scope="scope" slot="menuLeft"> <template slot-scope="scope" slot="menuLeft">
<el-button size="small" @click.stop="handleDesign()" type="primary">新增出库单 <el-button size="small" @click.stop="handleDesign()" type="primary"
>新增出库单
</el-button> </el-button>
</template> </template>
<template #menu="scope"> <template #menu="scope">
@ -16,8 +29,12 @@
> >
</template> </template>
<template slot-scope="scope" slot="xuqiudanmingcheng"> <template slot-scope="scope" slot="xuqiudanmingcheng">
<el-button type="text" @click.stop="purchaseFn(scope.row)" v-if="scope.row.xuqiudanmingcheng != ''">{{ <el-button
scope.row.xuqiudanmingcheng }}</el-button> type="text"
@click.stop="purchaseFn(scope.row)"
v-if="scope.row.xuqiudanmingcheng != ''"
>{{ scope.row.xuqiudanmingcheng }}</el-button
>
<span v-else>无</span> <span v-else>无</span>
</template> </template>
</avue-crud> </avue-crud>
@ -34,9 +51,12 @@
</outDialog> </outDialog>
<!-- 需求单明细 --> <!-- 需求单明细 -->
<needDialog :showDialog="purchaseOpen" v-if="purchaseOpen" @closeDialog="closeDialog" <needDialog
:purchaseTitle="purchaseTitle"> :showDialog="purchaseOpen"
</needDialog> v-if="purchaseOpen"
@closeDialog="closeDialog"
:purchaseTitle="purchaseTitle"
></needDialog>
<!-- 审批流程 --> <!-- 审批流程 -->
<approvalProcessDialog <approvalProcessDialog

Write Preview
Loading…
Cancel
Save