diff --git a/src/views/emis/emisSalesmenRel/emisSalesmenRelForm.vue b/src/views/emis/emisSalesmenRel/emisSalesmenRelForm.vue
index d5952cc5..be799023 100644
--- a/src/views/emis/emisSalesmenRel/emisSalesmenRelForm.vue
+++ b/src/views/emis/emisSalesmenRel/emisSalesmenRelForm.vue
@@ -9,7 +9,7 @@
-
+
@@ -70,6 +70,7 @@ import { listEmisSalesmenRel, getEmisSalesmenRel, delEmisSalesmenRel, addEmisSal
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
import SalesAssPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
import {addDateTimeByDay,dateToStr} from '@/utils/custom'
+import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
export default {
name: "emisSalesmenRelForm",
@@ -78,7 +79,7 @@ export default {
type:[Number,Array]
}
},
- components: { SalemanPicker,SalesAssPicker },
+ components: { SalemanPicker,SalesAssPicker,EmpNamePicker1 },
dicts: [
],
data() {
diff --git a/src/views/emis/emisTmsCostFeeSplit/index.vue b/src/views/emis/emisTmsCostFeeSplit/index.vue
index 8206ce47..30748619 100644
--- a/src/views/emis/emisTmsCostFeeSplit/index.vue
+++ b/src/views/emis/emisTmsCostFeeSplit/index.vue
@@ -4,7 +4,7 @@
-
@@ -365,8 +364,9 @@ import { listEmisTmsSiteBatch,
} from "@/api/emis/emisTmsSiteBatch";
import { listEmisTmsSiteBatchDtl, delEmisTmsSiteBatchDtl, addEmisTmsSiteBatchDtl } from "@/api/emis/emisTmsSiteBatchDtl";
import { addEmisTmsSiteBatchLoading, listEmisTmsSiteBatchLoading, updateEmisTmsSiteBatchLoading } from "@/api/emis/emisTmsSiteBatchLoading";
-import { listEmisWaybill } from "@/api/emis/emisWaybill";
+import { getWaybillDetail,listEmisWaybill } from "@/api/emis/emisWaybill";
import { listSimpleEmisSite } from "@/api/emis/emisSite";
+// import { getWaybillDetail} from "@/api/emis/emisWaybill";
import emisTmsPackForm from '@/views/emis/emisTmsPack/emisTmsPackForm';
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
@@ -385,8 +385,6 @@ import EmisTmsSiteBatchSupplierPicker from '@/views/emis/EmisBaseTools/EmisTmsSi
import EmisTmsSiteBatchNextSitePicker from '@/views/emis/EmisBaseTools/EmisTmsSiteBatchNextSitePicker.vue';
-
-
export default {
name: "BigBatchEditForm",
props: {
@@ -494,7 +492,6 @@ export default {
{ required: true, message: "包裹数量不能为空", trigger: ["blur","change"] },
],
-
},
openBatch: false,