|
@@ -337,11 +337,20 @@
|
|
|
width="800px"
|
|
|
>
|
|
|
<div style="width: 800px">
|
|
|
- <el-form ref="form" :label-position="labelPosition" label-width="100px" :model="insertFormData">
|
|
|
+ <el-form
|
|
|
+ ref="form"
|
|
|
+ :label-position="labelPosition"
|
|
|
+ label-width="100px"
|
|
|
+ :model="insertFormData"
|
|
|
+ >
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="供应商:" prop="supplier">
|
|
|
- <el-select v-model="insertFormData.supplierNo" style="width: 200px;" placeholder="请选择供应商">
|
|
|
+ <el-select
|
|
|
+ v-model="insertFormData.supplierNo"
|
|
|
+ style="width: 200px"
|
|
|
+ placeholder="请选择供应商"
|
|
|
+ >
|
|
|
<el-option
|
|
|
v-for="(option, index) in suppliers"
|
|
|
:key="option.id"
|
|
@@ -353,7 +362,10 @@
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="批号:" prop="lotNumber">
|
|
|
- <el-input v-model="insertFormData.lotNumber" style="width: 200px;"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="insertFormData.lotNumber"
|
|
|
+ style="width: 200px"
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
@@ -361,36 +373,44 @@
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="使用部门:" prop="useDepartment">
|
|
|
- <el-input v-model="insertFormData.useDepartment" style="width: 200px;"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="insertFormData.useDepartment"
|
|
|
+ style="width: 200px"
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="备注:" prop="remark">
|
|
|
- <el-input v-model="insertFormData.remark" style="width: 200px;"></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model="insertFormData.remark"
|
|
|
+ style="width: 200px"
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
</div>
|
|
|
- <el-table
|
|
|
- :data="insertTable"
|
|
|
- style="width: 100%"
|
|
|
- >
|
|
|
-<!-- -->
|
|
|
-<!-- <el-table-column-->
|
|
|
-<!-- align="center"-->
|
|
|
-<!-- prop="id"-->
|
|
|
-<!-- label="序号"-->
|
|
|
-<!-- width="80">-->
|
|
|
-<!-- </el-table-column>-->
|
|
|
+ <el-table :data="insertTable" style="width: 100%">
|
|
|
+ <!-- -->
|
|
|
+ <!-- <el-table-column-->
|
|
|
+ <!-- align="center"-->
|
|
|
+ <!-- prop="id"-->
|
|
|
+ <!-- label="序号"-->
|
|
|
+ <!-- width="80">-->
|
|
|
+ <!-- </el-table-column>-->
|
|
|
<el-table-column
|
|
|
align="center"
|
|
|
prop="materielId"
|
|
|
label="物料信息"
|
|
|
- width="180">
|
|
|
+ width="180"
|
|
|
+ >
|
|
|
<template v-slot:default="scope">
|
|
|
- <el-select v-model="scope.row.materielId" size="small" placeholder="请选择物料">
|
|
|
+ <el-select
|
|
|
+ v-model="scope.row.materielId"
|
|
|
+ size="small"
|
|
|
+ placeholder="请选择物料"
|
|
|
+ >
|
|
|
<el-option
|
|
|
v-for="(option, index) in materiels"
|
|
|
:key="index"
|
|
@@ -404,15 +424,13 @@
|
|
|
align="center"
|
|
|
prop="quantity"
|
|
|
label="数量/重量"
|
|
|
- width="180">
|
|
|
+ width="180"
|
|
|
+ >
|
|
|
<template v-slot:default="scope">
|
|
|
<el-input v-model="scope.row.quantity" size="small"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- prop="remark"
|
|
|
- label="备注">
|
|
|
+ <el-table-column align="center" prop="remark" label="备注">
|
|
|
<template v-slot:default="scope">
|
|
|
<el-input v-model="scope.row.remark" size="small"></el-input>
|
|
|
</template>
|
|
@@ -422,7 +440,9 @@
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="danger"
|
|
|
- @click="handleRowDelete(scope.$index, scope.row)">删除</el-button>
|
|
|
+ @click="handleRowDelete(scope.$index, scope.row)"
|
|
|
+ >删除</el-button
|
|
|
+ >
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -432,79 +452,85 @@
|
|
|
class="buttonAdd"
|
|
|
icon="el-icon-plus"
|
|
|
@click="addRow"
|
|
|
- >添加一行</el-button>
|
|
|
+ >添加一行</el-button
|
|
|
+ >
|
|
|
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
- <el-button @click="insertFrom=false">取 消</el-button>
|
|
|
- <el-button type="primary" @click="insertTableRequest">确 定</el-button>
|
|
|
- </span>
|
|
|
+ <el-button @click="insertFrom = false">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="insertTableRequest">确 定</el-button>
|
|
|
+ </span>
|
|
|
</el-dialog>
|
|
|
|
|
|
<!-- 打印弹窗 -->
|
|
|
- <el-dialog title="采购单详情" :visible.sync="viewPurchaseOrderDetailsShow" width="1000px">
|
|
|
- <div class="titleDiv">
|
|
|
-<!-- <h3><i>采购单编号:</i><span>{{particularsOfSalesNote.purchaseOrderNumber}}</span></h3>-->
|
|
|
- <h3><i>供应商:</i><span>{{particularsOfSalesNote.supplierName}}</span></h3>
|
|
|
- <h3><i>采购批号:</i><span>{{particularsOfSalesNote.purchaseLotNumber}}</span></h3>
|
|
|
- <h3><i>采购时间:</i><span>{{particularsOfSalesNote.purchaseTiem }}</span></h3>
|
|
|
- </div>
|
|
|
- <div class="tableDiv">
|
|
|
- <el-table
|
|
|
- :data="purchaseInfo"
|
|
|
- style="width: 100%">
|
|
|
- <el-table-column
|
|
|
- prop="materielCode"
|
|
|
- align="center"
|
|
|
- label="物料编码">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="materielName"
|
|
|
- align="center"
|
|
|
- label="物料名称">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="materieEncoding"
|
|
|
- align="center"
|
|
|
- label="转码名称">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="materieColorNumber"
|
|
|
- align="center"
|
|
|
- label="色号">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="specificationModel"
|
|
|
- align="center"
|
|
|
- label="规格型号">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="units"
|
|
|
- align="center"
|
|
|
- label="单位">
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="quantity"
|
|
|
- align="center"
|
|
|
- label="数量/重量">
|
|
|
- </el-table-column>
|
|
|
-<!-- <el-table-column-->
|
|
|
-<!-- prop="totalAmount"-->
|
|
|
-<!-- align="center"-->
|
|
|
-<!-- label="总金额">-->
|
|
|
-<!-- </el-table-column>-->
|
|
|
- <el-table-column label="操作" width="100px" align="center">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="danger"
|
|
|
- @click.stop.prevent="toPrint(scope.$index, scope.row)">打印</el-button>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
- </div>
|
|
|
+ <el-dialog
|
|
|
+ title="采购单详情"
|
|
|
+ :visible.sync="viewPurchaseOrderDetailsShow"
|
|
|
+ width="1000px"
|
|
|
+ >
|
|
|
+ <div class="titleDiv">
|
|
|
+ <!-- <h3><i>采购单编号:</i><span>{{particularsOfSalesNote.purchaseOrderNumber}}</span></h3>-->
|
|
|
+ <h3>
|
|
|
+ <i>供应商:</i><span>{{ particularsOfSalesNote.supplierName }}</span>
|
|
|
+ </h3>
|
|
|
+ <h3>
|
|
|
+ <i>采购批号:</i
|
|
|
+ ><span>{{ particularsOfSalesNote.purchaseLotNumber }}</span>
|
|
|
+ </h3>
|
|
|
+ <h3>
|
|
|
+ <i>采购时间:</i
|
|
|
+ ><span>{{ particularsOfSalesNote.purchaseTiem }}</span>
|
|
|
+ </h3>
|
|
|
+ </div>
|
|
|
+ <div class="tableDiv">
|
|
|
+ <el-table :data="purchaseInfo" style="width: 100%">
|
|
|
+ <el-table-column prop="materielCode" align="center" label="物料编码">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="materielName" align="center" label="物料名称">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="materieEncoding"
|
|
|
+ align="center"
|
|
|
+ label="转码名称"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="materieColorNumber"
|
|
|
+ align="center"
|
|
|
+ label="色号"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="specificationModel"
|
|
|
+ align="center"
|
|
|
+ label="规格型号"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="units" align="center" label="单位">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="quantity" align="center" label="数量/重量">
|
|
|
+ </el-table-column>
|
|
|
+ <!-- <el-table-column-->
|
|
|
+ <!-- prop="totalAmount"-->
|
|
|
+ <!-- align="center"-->
|
|
|
+ <!-- label="总金额">-->
|
|
|
+ <!-- </el-table-column>-->
|
|
|
+ <el-table-column label="操作" width="100px" align="center">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="danger"
|
|
|
+ @click.stop.prevent="toPrint(scope.$index, scope.row)"
|
|
|
+ >打印</el-button
|
|
|
+ >
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
- <el-button @click="printShow = false">取 消</el-button>
|
|
|
- <el-button type="primary">确认</el-button>
|
|
|
+ <el-button @click="viewPurchaseOrderDetailsShow = false"
|
|
|
+ >取 消</el-button
|
|
|
+ >
|
|
|
+ <!-- <el-button type="primary">确认</el-button> -->
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
|
|
@@ -523,7 +549,13 @@ import {
|
|
|
addTableData,
|
|
|
batchEdit,
|
|
|
} from "@/api/tablelist/commonTable";
|
|
|
-import {getListSupplier, getListMateriel, addPurchase, getPurchaseInfos, updatePurchase} from "@/api/supplier/supplier";
|
|
|
+import {
|
|
|
+ getListSupplier,
|
|
|
+ getListMateriel,
|
|
|
+ addPurchase,
|
|
|
+ getPurchaseInfos,
|
|
|
+ updatePurchase,
|
|
|
+} from "@/api/supplier/supplier";
|
|
|
import { listData } from "@/api/system/tenant/data";
|
|
|
import { getPurchaseInfo } from "@/api/tablelist/purchaseInfo";
|
|
|
import { getToken } from "@/utils/auth";
|
|
@@ -537,7 +569,7 @@ import DialogTemplate from "@/views/dialogTemplate/components/index.vue";
|
|
|
import FormList from "@/components/FormGroup/formList.vue";
|
|
|
import { v4 as uuidv4 } from "uuid";
|
|
|
import printHtml from "./print";
|
|
|
-import { Base64 } from 'js-base64'
|
|
|
+import { Base64 } from "js-base64";
|
|
|
import qrCodeList from "@/utils/print/qrCodeList";
|
|
|
|
|
|
export default {
|
|
@@ -546,21 +578,21 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
insertTable: [],
|
|
|
- labelPosition: 'right',
|
|
|
- insertFromTitle:'',
|
|
|
- insertFormData:{},
|
|
|
- suppliers:[{"id":1,"name":"供应商1"}],
|
|
|
- insertFrom:false,
|
|
|
- materiels:[],
|
|
|
- particularsOfSalesNote:{
|
|
|
- purchaseOrderNumber:"",
|
|
|
- supplierName:"",
|
|
|
- purchaseLotNumber:"",
|
|
|
- purchaseTiem:"采购时间"
|
|
|
+ labelPosition: "right",
|
|
|
+ insertFromTitle: "",
|
|
|
+ insertFormData: {},
|
|
|
+ suppliers: [{ id: 1, name: "供应商1" }],
|
|
|
+ insertFrom: false,
|
|
|
+ materiels: [],
|
|
|
+ particularsOfSalesNote: {
|
|
|
+ purchaseOrderNumber: "",
|
|
|
+ supplierName: "",
|
|
|
+ purchaseLotNumber: "",
|
|
|
+ purchaseTiem: "采购时间",
|
|
|
},
|
|
|
- purchaseInfo:[],
|
|
|
+ purchaseInfo: [],
|
|
|
//是否显示销售单详情表单
|
|
|
- viewPurchaseOrderDetailsShow:false,
|
|
|
+ viewPurchaseOrderDetailsShow: false,
|
|
|
// 顶部按钮数据
|
|
|
topBtnArr: [], //顶部按钮数据
|
|
|
selection: [], //选中数组
|
|
@@ -697,7 +729,6 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
-
|
|
|
// 得到当前展示的table的唯一标识
|
|
|
this.tableKey = this.$route.query.tableKey;
|
|
|
},
|
|
@@ -718,127 +749,137 @@ export default {
|
|
|
// },
|
|
|
},
|
|
|
methods: {
|
|
|
- caiGouUpdate(btnInfo,row){
|
|
|
+ caiGouUpdate(btnInfo, row) {
|
|
|
this.insertFromTitle = "修改采购信息";
|
|
|
this.insertFrom = true;
|
|
|
- this.insertFormData={}
|
|
|
- this.insertTable=[];
|
|
|
+ this.insertFormData = {};
|
|
|
+ this.insertTable = [];
|
|
|
this.getListMateriel();
|
|
|
this.getListSupplier();
|
|
|
- console.log(row)
|
|
|
+ console.log(row);
|
|
|
// row.purchaseId getInfoEditPurchaseId PurchaseId
|
|
|
- getPurchaseInfos(row.purchaseSerialNumber).then(res=>{
|
|
|
- this.insertFormData=res.data;
|
|
|
- this.insertTable=res.data.purchaseInfos;
|
|
|
- })
|
|
|
+ getPurchaseInfos(row.purchaseSerialNumber).then((res) => {
|
|
|
+ this.insertFormData = res.data;
|
|
|
+ this.insertTable = res.data.purchaseInfos;
|
|
|
+ });
|
|
|
},
|
|
|
- insertTableRequest(){
|
|
|
- if(this.insertFromTitle=="新增采购信息"){
|
|
|
- console.log(this.insertFormData.supplierNo)
|
|
|
- if(this.insertFormData.supplierNo!=undefined&&this.insertFormData.lotNumber!=undefined&&this.insertFormData.useDepartment!=undefined&&this.insertFormData.remark!=undefined){
|
|
|
+ insertTableRequest() {
|
|
|
+ if (this.insertFromTitle == "新增采购信息") {
|
|
|
+ console.log(this.insertFormData.supplierNo);
|
|
|
+ if (
|
|
|
+ this.insertFormData.supplierNo != undefined &&
|
|
|
+ this.insertFormData.lotNumber != undefined &&
|
|
|
+ this.insertFormData.useDepartment != undefined &&
|
|
|
+ this.insertFormData.remark != undefined
|
|
|
+ ) {
|
|
|
//携带表格数据
|
|
|
- this.insertFormData.purchaseInfos=this.insertTable;
|
|
|
- addPurchase(this.insertFormData).then(res=>{
|
|
|
- if(res.code==200){
|
|
|
+ this.insertFormData.purchaseInfos = this.insertTable;
|
|
|
+ addPurchase(this.insertFormData).then((res) => {
|
|
|
+ if (res.code == 200) {
|
|
|
this.$message({
|
|
|
- message: '添加成功',
|
|
|
- type: 'success'
|
|
|
+ message: "添加成功",
|
|
|
+ type: "success",
|
|
|
});
|
|
|
this.insertFrom = false;
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
this.$message({
|
|
|
- message: '添加失败',
|
|
|
- type: 'warning'
|
|
|
+ message: "添加失败",
|
|
|
+ type: "warning",
|
|
|
});
|
|
|
}
|
|
|
- })
|
|
|
- }else {
|
|
|
+ });
|
|
|
+ } else {
|
|
|
this.$message({
|
|
|
- message: '请完善表单',
|
|
|
- type: 'warning'
|
|
|
+ message: "请完善表单",
|
|
|
+ type: "warning",
|
|
|
});
|
|
|
}
|
|
|
- }else {
|
|
|
- console.log(this.insertFormData.supplierNo)
|
|
|
- if(this.insertFormData.supplierNo!=undefined&&this.insertFormData.lotNumber!=undefined&&this.insertFormData.useDepartment!=undefined&&this.insertFormData.remark!=undefined){
|
|
|
+ } else {
|
|
|
+ console.log(this.insertFormData.supplierNo);
|
|
|
+ if (
|
|
|
+ this.insertFormData.supplierNo != undefined &&
|
|
|
+ this.insertFormData.lotNumber != undefined &&
|
|
|
+ this.insertFormData.useDepartment != undefined &&
|
|
|
+ this.insertFormData.remark != undefined
|
|
|
+ ) {
|
|
|
//携带表格数据
|
|
|
- this.insertFormData.purchaseInfos=this.insertTable;
|
|
|
- updatePurchase(this.insertFormData).then(res=>{
|
|
|
- if(res.code==200){
|
|
|
+ this.insertFormData.purchaseInfos = this.insertTable;
|
|
|
+ updatePurchase(this.insertFormData).then((res) => {
|
|
|
+ if (res.code == 200) {
|
|
|
this.$message({
|
|
|
- message: '修改成功',
|
|
|
- type: 'success'
|
|
|
+ message: "修改成功",
|
|
|
+ type: "success",
|
|
|
});
|
|
|
this.insertFrom = false;
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
this.$message({
|
|
|
- message: '修改失败',
|
|
|
- type: 'warning'
|
|
|
+ message: "修改失败",
|
|
|
+ type: "warning",
|
|
|
});
|
|
|
}
|
|
|
- })
|
|
|
- }else {
|
|
|
+ });
|
|
|
+ } else {
|
|
|
this.$message({
|
|
|
- message: '请完善表单',
|
|
|
- type: 'warning'
|
|
|
+ message: "请完善表单",
|
|
|
+ type: "warning",
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
this.getList();
|
|
|
},
|
|
|
//原材料信息
|
|
|
- getListMateriel(){
|
|
|
- getListMateriel().then(res=>{
|
|
|
- this.materiels=res.data;
|
|
|
- })
|
|
|
+ getListMateriel() {
|
|
|
+ getListMateriel().then((res) => {
|
|
|
+ this.materiels = res.data;
|
|
|
+ });
|
|
|
},
|
|
|
//供应商信息
|
|
|
- getListSupplier(){
|
|
|
- getListSupplier().then(res=>{
|
|
|
- this.suppliers=res.data
|
|
|
- })
|
|
|
+ getListSupplier() {
|
|
|
+ getListSupplier().then((res) => {
|
|
|
+ this.suppliers = res.data;
|
|
|
+ });
|
|
|
},
|
|
|
//删除一行
|
|
|
- handleRowDelete($index,rwo){
|
|
|
- this.insertTable.splice($index,1)
|
|
|
+ handleRowDelete($index, rwo) {
|
|
|
+ this.insertTable.splice($index, 1);
|
|
|
},
|
|
|
//添加一行
|
|
|
- addRow(){
|
|
|
+ addRow() {
|
|
|
// 添加一行数据 id materielId quantity remark
|
|
|
const newRow = {
|
|
|
- id: this.insertTable.length+1,
|
|
|
+ id: this.insertTable.length + 1,
|
|
|
materielId: undefined,
|
|
|
quantity: undefined,
|
|
|
- remark:undefined,
|
|
|
+ remark: undefined,
|
|
|
disableInput: false,
|
|
|
};
|
|
|
this.insertTable.push(newRow);
|
|
|
},
|
|
|
//关闭逻辑
|
|
|
- insertFromClose(){
|
|
|
+ insertFromClose() {
|
|
|
this.insertFrom = false;
|
|
|
},
|
|
|
- insertFromHander(){
|
|
|
+ insertFromHander() {
|
|
|
this.insertFromTitle = "新增采购信息";
|
|
|
// this.insertFormData.supplierNo=undefined
|
|
|
// this.insertFormData.lotNumber=undefined
|
|
|
// this.insertFormData.useDepartment=undefined
|
|
|
// this.insertFormData.remark=undefined
|
|
|
- this.insertFormData={};
|
|
|
- this.insertTable=[];
|
|
|
+ this.insertFormData = {};
|
|
|
+ this.insertTable = [];
|
|
|
this.insertFrom = true;
|
|
|
this.getListSupplier();
|
|
|
this.getListMateriel();
|
|
|
},
|
|
|
//打印逻辑方法
|
|
|
- toPrint(rwoIndex,row){
|
|
|
- console.log(rwoIndex,row);
|
|
|
+ toPrint(rwoIndex, row) {
|
|
|
+ console.log(rwoIndex, row);
|
|
|
//拼接码内容 采购单号,编码号,单位,规格型号,数量,
|
|
|
- let stringInner =this.particularsOfSalesNote.purchaseLotNumber
|
|
|
- let timeCode= new Date().getTime().toString();
|
|
|
+ let stringInner = this.particularsOfSalesNote.purchaseLotNumber;
|
|
|
+ let timeCode = new Date().getTime().toString();
|
|
|
//二维码内容
|
|
|
// 时间戳 批号 母粒id
|
|
|
- let codeString= timeCode+"@"+ stringInner +"@"+ row.materielId
|
|
|
+ let codeString = timeCode + "@" + stringInner + "@" + row.materielId;
|
|
|
// const encodePwd = Base64.encode(codeString);//加密
|
|
|
// const encodePwd = encodeURIComponent(codeString)
|
|
|
//声明一个数组对象
|
|
@@ -847,25 +888,25 @@ export default {
|
|
|
allPringtData.push({
|
|
|
codeData: codeString,
|
|
|
showMsg: [
|
|
|
- {label: "批号", value: stringInner},
|
|
|
- {label: "母粒编码", value: row.materieEncoding},
|
|
|
- {label: "色号", value: row.materieColorNumber},
|
|
|
+ { label: "批号", value: stringInner },
|
|
|
+ { label: "母粒编码", value: row.materieEncoding },
|
|
|
+ { label: "色号", value: row.materieColorNumber },
|
|
|
],
|
|
|
});
|
|
|
qrCodeList(allPringtData, "printDom");
|
|
|
},
|
|
|
- viewPurchaseOrderDetails(btnData, row){
|
|
|
- console.log(this.currentRow,btnData,row);
|
|
|
- this.particularsOfSalesNote.purchaseOrderNumber=row.purchaseId
|
|
|
- this.particularsOfSalesNote.supplierName=row.supplierSupplierName
|
|
|
- this.particularsOfSalesNote.purchaseLotNumber=row.purchaseLotNumber
|
|
|
- this.particularsOfSalesNote.purchaseTiem=row.purchaseCreateTime
|
|
|
- this.viewPurchaseOrderDetailsShow=true;
|
|
|
+ viewPurchaseOrderDetails(btnData, row) {
|
|
|
+ console.log(this.currentRow, btnData, row);
|
|
|
+ this.particularsOfSalesNote.purchaseOrderNumber = row.purchaseId;
|
|
|
+ this.particularsOfSalesNote.supplierName = row.supplierSupplierName;
|
|
|
+ this.particularsOfSalesNote.purchaseLotNumber = row.purchaseLotNumber;
|
|
|
+ this.particularsOfSalesNote.purchaseTiem = row.purchaseCreateTime;
|
|
|
+ this.viewPurchaseOrderDetailsShow = true;
|
|
|
// console.log(row,"行数据");
|
|
|
- getPurchaseInfo({"purchaseId":row.purchaseSerialNumber}).then(resp=>{
|
|
|
- this.purchaseInfo=resp.data
|
|
|
- console.log(this.purchaseInfo)
|
|
|
- })
|
|
|
+ getPurchaseInfo({ purchaseId: row.purchaseSerialNumber }).then((resp) => {
|
|
|
+ this.purchaseInfo = resp.data;
|
|
|
+ console.log(this.purchaseInfo);
|
|
|
+ });
|
|
|
},
|
|
|
// test
|
|
|
showValue() {
|
|
@@ -927,7 +968,7 @@ export default {
|
|
|
this.topBtnArr = res.data.resultMap.button?.filter(
|
|
|
(item) => item.btnGroupType == "top"
|
|
|
);
|
|
|
- console.log(this.topBtnArr,"dddddddddd");
|
|
|
+ console.log(this.topBtnArr, "dddddddddd");
|
|
|
this.calcuteExcuteCol();
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.tableRef.doLayout();
|
|
@@ -2489,13 +2530,13 @@ export default {
|
|
|
</script>
|
|
|
|
|
|
<style scoped lang="scss">
|
|
|
-.tableDiv{
|
|
|
+.tableDiv {
|
|
|
margin-top: 20px;
|
|
|
}
|
|
|
-.titleDiv{
|
|
|
+.titleDiv {
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
- i{
|
|
|
+ i {
|
|
|
font-style: normal;
|
|
|
font-weight: 900;
|
|
|
color: #000000;
|
|
@@ -2504,5 +2545,4 @@ export default {
|
|
|
::v-deep .el-dialog:not(.is-fullscreen) {
|
|
|
min-width: 610px !important;
|
|
|
}
|
|
|
-
|
|
|
</style>
|