UDI
/
udi-spms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:优化关联关系

Browse Source
dev_unify
chenhc 8 months ago
parent e15d9553f3
commit f1eb4fb015
1 changed files with 103 additions and 86 deletions
Show Stats Download Patch File Download Diff File

189
src/views/collect/relCode/relCode.vue
Unescape Escape View File

@ -16,22 +16,22 @@
v-model="filterQuery.code" v-model="filterQuery.code"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="产品编码:"> <el-form-item label="产品编码:">
<el-input v-model="filterQuery.productCode" placeholder="请输入产品编码" clearable></el-input> <el-input v-model="filterQuery.productCode" placeholder="请输入产品编码" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="批次号:"> <el-form-item label="批次号:">
<el-input v-model="filterQuery.batchNo" placeholder="请输入批次号" clearable></el-input> <el-input v-model="filterQuery.batchNo" placeholder="请输入批次号" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="失效日期:"> <el-form-item label="失效日期:">
<el-date-picker <el-date-picker
style="width: 100%" style="width: 100%"
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
@ -41,9 +41,9 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
@ -55,24 +55,24 @@
<el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button> <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
<!-- <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">手动新增</el-button> --> <!-- <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">手动新增</el-button> -->
<el-upload <el-upload
:action="action" :action="action"
:headers ="headers" :headers ="headers"
accept=".xml" accept=".xml"
:on-preview="handlePreview" :on-preview="handlePreview"
:on-remove="handleRemove" :on-remove="handleRemove"
:before-remove="beforeRemove" :before-remove="beforeRemove"
:on-success="handleSuccess" :on-success="handleSuccess"
:on-progress="handleProgress" :on-progress="handleProgress"
:on-error="handleError" :on-error="handleError"
:before-upload="beforeUpload" :before-upload="beforeUpload"
:limit="5" :limit="5"
:on-exceed="handleExceed" :on-exceed="handleExceed"
:file-list="fileList" :file-list="fileList"
:show-file-list="false" :show-file-list="false"
:data="extraData"> :data="extraData">
<el-button size="small" icon="el-icon-upload" type="primary">文件上传</el-button> <el-button size="small" icon="el-icon-upload" type="primary">文件上传</el-button>
<!-- <div slot="tip" class="el-upload__tip">只能上传xml文件，且不超过5M</div> --> <!-- <div slot="tip" class="el-upload__tip">只能上传xml文件，且不超过5M</div> -->
</el-upload> </el-upload>
</el-button-group> </el-button-group>
</div> </div>
@ -93,8 +93,8 @@
<el-table-column label="备注" prop="comment"></el-table-column> <el-table-column label="备注" prop="comment"></el-table-column>
<el-table-column label="操作" width="120px"> <el-table-column label="操作" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">详情</el-button>
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button> <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
<!-- <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">拼箱</el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -111,24 +111,31 @@
<el-dialog <el-dialog
:title="formName" :title="formName"
:visible.sync="newSpDistributionVisible" :visible.sync="newSpDistributionVisible"
width="85%" width="45%"
append-to-body append-to-body
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="newSpDistributionVisible" v-if="newSpDistributionVisible"
@close='closeDialog' @close='closeDialog'
> >
<operateRelCode <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="800" height="500"
:closeDialog="closeDialog" border
:orderQuery="idQuery" ref="multipleTable">
></operateRelCode> <el-table-column label="序号" type="index" width="55"></el-table-column>
<el-table-column
label="追溯码"
prop="curCode"
width="280"
show-overflow-tooltip
></el-table-column>
</el-table>
</el-dialog> </el-dialog>
</el-card> </el-card>
</div> </div>
</template> </template>
<script> <script>
import {getList,delRelCode} from "@/api/collect/relCode"; import {getList,delRelCode,getDetailList} from "@/api/collect/relCode";
import {getAdminId, getToken} from '@/utils/auth'; import {getAdminId, getToken} from '@/utils/auth';
import operateRelCode from "@/views/collect/relCode/operateRelCode" import operateRelCode from "@/views/collect/relCode/operateRelCode"
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
@ -155,6 +162,7 @@ export default {
formData: null, formData: null,
total: 0, total: 0,
actDateRange:[], actDateRange:[],
codeArray:[],
scanCode:null, scanCode:null,
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [
@ -228,25 +236,34 @@ export default {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
}, },
newDistributionForm(index, row) { newDistributionForm(index, row) {
if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) { this.formName = "码明细";
this.idQuery = row; //获取码明细
this.formName = "拼箱"; let post = {
this.newSpDistributionVisible = true; batchIdFk: row.id,
} else { page: 1,
this.formName = "新增"; limit: 500
this.newSpDistributionVisible = true;
} }
getDetailList(post).then((response) => {
if (response.code == 20000) {
this.codeArray = response.data.list
this.newSpDistributionVisible = true;
} else {
this.$message.error(response.message);
}
}).catch(() => {
});
}, },
closeDialog() { closeDialog() {
this.newSpDistributionVisible = false; this.newSpDistributionVisible = false;
this.getList(); this.getList();
this.detailList = []; this.detailList = [];
}, },
enterKey(event){
this.onSubmitFind()
},
getInputFocus(event) { getInputFocus(event) {
event.currentTarget.select(); event.currentTarget.select();
},
enterKey(event){
this.onSubmitFind();
}, },
deleteDialog(row) { deleteDialog(row) {
this.$confirm("此操作将永久删除关联记录, 是否继续?", "提示", { this.$confirm("此操作将永久删除关联记录, 是否继续?", "提示", {
@ -256,16 +273,16 @@ export default {
}) })
.then(() => { .then(() => {
delRelCode({id:row.id}) delRelCode({id:row.id})
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.getList(); this.getList();
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
}) })
.catch(() => { .catch(() => {
}); });
}) })
.catch(() => { .catch(() => {
}); });
@ -351,31 +368,31 @@ export default {
}, },
filters: {}, filters: {},
mounted() { mounted() {
document.body.ondrop = function (event) { document.body.ondrop = function (event) {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
}; };
var that = this; var that = this;
var inputer = document.getElementById("inputer"); var inputer = document.getElementById("inputer");
window.sc = new A.KeyScaner(inputer); //传入要监听的DOM节点 window.sc = new A.KeyScaner(inputer); //传入要监听的DOM节点
sc.onInput = function (text) { sc.onInput = function (text) {
if (text.includes("delete")) { if (text.includes("delete")) {
that.codeFormData.code = ""; that.codeFormData.code = "";
that.sictomText = ""; that.sictomText = "";
that.originCode = ""; that.originCode = "";
return; return;
} }
if (that.sitcomScan) { if (that.sitcomScan) {
let tempTxt = text; let tempTxt = text;
let str = tempTxt.replace(/[\r]/g, ""); let str = tempTxt.replace(/[\r]/g, "");
that.sictomText = that.sictomText + str; that.sictomText = that.sictomText + str;
that.codeFormData.code = that.sictomText; that.codeFormData.code = that.sictomText;
} else { } else {
that.codeFormData.code = text; that.codeFormData.code = text;
} }
}; };
inputer.focus(); inputer.focus();
this.$refs.inputRef.focus(); this.$refs.inputRef.focus();
}, },
created() { created() {
this.getList(); this.getList();

Write Preview
Loading…
Cancel
Save