|
|
@@ -34,7 +34,7 @@
|
|
|
<template #productName="{ item }">
|
|
|
<div>
|
|
|
<div v-for="(row, index) in getData(item.codeAPName, 'productName')" :key="index">
|
|
|
- <el-tooltip class="box-item" effect="dark" :content="item" placement="top-start">
|
|
|
+ <el-tooltip class="box-item" effect="dark" :content="row" placement="top-start">
|
|
|
<div class="hidden-text">
|
|
|
{{ row }}
|
|
|
</div>
|
|
|
@@ -264,7 +264,7 @@
|
|
|
<el-button type="primary" @click="submitForm()" size="large" :loading="submitLoading"> 确 定 </el-button>
|
|
|
</template>
|
|
|
</el-dialog>
|
|
|
-
|
|
|
+
|
|
|
<el-dialog title="合并出货" v-model="dialogVisibleOne" width="400" v-loading="loadingOne">
|
|
|
<byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.dataOne" :rules="rules" ref="byform"> </byForm>
|
|
|
<template #footer>
|
|
|
@@ -469,15 +469,26 @@ const config = computed(() => {
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "操作",
|
|
|
- width: "90",
|
|
|
+ width: "140",
|
|
|
align: "center",
|
|
|
fixed: "right",
|
|
|
},
|
|
|
- // 渲染 el-button，一般用在最后一列。
|
|
|
renderHTML(row) {
|
|
|
return [
|
|
|
{
|
|
|
attrs: {
|
|
|
+ label: "出货通知",
|
|
|
+ type: "primary",
|
|
|
+ text: true,
|
|
|
+ disabled: false,
|
|
|
+ },
|
|
|
+ el: "button",
|
|
|
+ click() {
|
|
|
+ clickShippingNotice(row);
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ attrs: {
|
|
|
label: "删除",
|
|
|
type: "primary",
|
|
|
text: true,
|
|
|
@@ -830,6 +841,9 @@ const handleClose = () => {
|
|
|
};
|
|
|
getSelectData();
|
|
|
getList();
|
|
|
+const clickShippingNotice = (row) => {
|
|
|
+ console.log(row);
|
|
|
+};
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss" scoped>
|
