diff --git a/src/views/emis/emisTmsSiteBatchMiss/index.vue b/src/views/emis/emisTmsSiteBatchMiss/index.vue
index 28431f23..475c768d 100644
--- a/src/views/emis/emisTmsSiteBatchMiss/index.vue
+++ b/src/views/emis/emisTmsSiteBatchMiss/index.vue
@@ -88,7 +88,21 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
无需组批次
+
+
+ 已签收
+ 未签收
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
无需组批次
+
+
+ 已签收
+ 未签收
+
+
+
+
+
@@ -260,10 +283,12 @@ import EmpNamePicker5 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import {timeFormat} from '@/utils/dateUtils'
import confirmForm from "@/views/emis/emisTmsSiteBatchMiss/confirmForm.vue";
+import ProblemTypeMultiplePicker from '@/views/emis/EmisBaseTools/ProblemTypeMultiplePicker.vue';
export default {
name: "EmisTmsSiteBatchMissV2",
components: {
+ ProblemTypeMultiplePicker,
elDateAdvPicker,
emisTransPlanRuleForm,
EmisSupplierPicker,
@@ -327,7 +352,12 @@ export default {
remark: null,
delFlag: null,
missCount:null,
- sendSiteCode:null
+ sendSiteCode:null,
+ blSign:null,
+ params: {
+ problemQueryType: null,
+ problemQueryIds: null
+ }
},
billCodeList:[] // 选中的单号
};
diff --git a/src/views/emis/salesCommissionRatio/index.vue b/src/views/emis/salesCommissionRatio/index.vue
index 7cfb36d6..d3a5001a 100644
--- a/src/views/emis/salesCommissionRatio/index.vue
+++ b/src/views/emis/salesCommissionRatio/index.vue
@@ -53,7 +53,7 @@
- {{scope.row.salesExecutiveRatio}}%
+ {{scope.row.salesExecutiveRatio?scope.row.salesExecutiveRatio+ '%':''}}
@@ -61,14 +61,14 @@
- {{scope.row.salesmenRatio}}%
+ {{scope.row.salesmenRatio?scope.row.salesmenRatio+ '%':''}}
- {{scope.row.salesSupportRatio}}%
+ {{scope.row.salesSupportRatio?scope.row.salesSupportRatio+ '%':''}}
@@ -134,6 +134,8 @@ export default {
selectionList: null,
// 查询参数
queryParams: {
+ pageNum: 1,
+ pageSize: 20,
salesExecutive: null,
salesSupport: null,
salesmen: null,