diff --git a/src/views/emis/emisTmsSiteBatch/BigBatchGroupMgnt.vue b/src/views/emis/emisTmsSiteBatch/BigBatchGroupMgnt.vue
index e4eb7ee8..df477afb 100644
--- a/src/views/emis/emisTmsSiteBatch/BigBatchGroupMgnt.vue
+++ b/src/views/emis/emisTmsSiteBatch/BigBatchGroupMgnt.vue
@@ -4,10 +4,10 @@
-
+
-
-
+
+
@@ -39,6 +39,8 @@ export default {
openEditForm:false,
openViewForm:false,
batchId:null,
+ isCopy:false,
+ editTabTitle:'批次编辑',
};
},
created() {
@@ -50,16 +52,28 @@ export default {
onCreateBatch(){
this.batchId=null;
this.openEditForm=true;
+ this.isCopy = false;
+ this.editTabTitle='批次创建';
this.activeTab='batchEdit';
},
onUpdateBatch(batchId){
this.batchId=batchId;
+ this.isCopy = false;
this.openEditForm=true;
+ this.editTabTitle='批次编辑';
this.activeTab='batchEdit';
},
+ onCopyBatch(batchId){
+ this.batchId=batchId;
+ this.openEditForm=true;
+ this.isCopy = true;
+ this.editTabTitle='批次复制';
+ this.activeTab='batchEdit';
+ },
onViewBatch(batchId){
this.batchId=batchId;
+ this.isCopy = false;
this.openViewForm=true;
this.activeTab='batchView';
},
diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
index ec586098..74bae015 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
@@ -384,6 +384,9 @@ export default {
type:[Number,Array],
required: false
},
+ isCopy:{
+ type:Boolean
+ },
disabled: {
type:[Boolean],
required: false
@@ -664,6 +667,9 @@ export default {
if(this.batchId !=null) {
this.showBatchInfo(this.batchId);
this.coPackType = "edit";
+
+
+
}else{
this.reset();
@@ -726,11 +732,11 @@ export default {
this.$modal.msgError(response && response.msg || "未知错误");
return;
}
- // let resData = response.data;
- // let time = {};
- // time.carTime = resData.etd;
this.form = {...response.data};
+
+
+
this.emisCoPackDetail=[];
let resList = await listEmisTmsSiteBatchDtl({batchNo: this.form.batchNo});
if(!resList || resList.code != 200){
@@ -773,6 +779,14 @@ export default {
this.currentId=null;
this.openForm= true;
this.titleForm = "修改组批次";
+
+ if(this.isCopy){
+ let resPack = await getTmsGroupBatchNo();
+ this.form.batchNo = resPack.data;
+ this.form.id = null;
+ this.coPackType = "add";
+ this.form.batchDate=parseTime(new Date());
+ }
},
getWaybillList(){
diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
index f5581829..134d2598 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
@@ -106,6 +106,14 @@
@click="handleAdd"
v-hasPermi="['emis:emisTmsSiteBatch:add']"
>新组批次
+ 复制批次