aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'master-dev' (#157) from master-dev into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/157
This commit is contained in:
wuteng 2025-12-04 16:13:48 +08:00
commit d33c6d7b90
3 changed files with 70 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/views/emis/emisTmsSiteBatchMiss/index.vue
View File

@ -88,7 +88,21 @@
<el-form-item :label="$t('录入人')" prop="registerManName">
<EmpNamePicker5 :placeholder="$t('请选择')" v-model="queryParams.registerManName" ></EmpNamePicker5>
</el-form-item>
<el-form-item label="问题件方式" prop="params.problemQueryType" label-width="90px">
<el-select clearable="" v-model="queryParams.params.problemQueryType" placeholder="请选择">
<el-option label="只查问题件类型" :value="1"></el-option>
<el-option label="剔除问题件类型" :value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="问题件类型" prop="params.problemQueryIds" label-width="90px">
<ProblemTypeMultiplePicker v-model="queryParams.params.problemQueryIds" ></ProblemTypeMultiplePicker>
</el-form-item>
<el-form-item label="签收状态" prop="blSign">
<el-select clearable v-model="queryParams.blSign" placeholder="请选择">
<el-option label="已签收" :value="1"></el-option>
<el-option label="未签收" :value="0"></el-option>
</el-select>
</el-form-item>
</SearchForm>
<XdTable
@ -216,8 +230,16 @@
<span v-if="scope.row.blManual==3">无需组批次</span>
</template>
</el-table-column>
<el-table-column :label="$t('签收状态')" align="center" prop="blSign" width="80" >
<template slot-scope="scope">
<el-tag v-if="scope.row.blSign=='1'" type="success">已签收</el-tag>
<el-tag v-else type="danger">未签收</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('问题件类型')" align="center" prop="problemTypeName" width="120" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" width="120" :show-overflow-tooltip="true"/>
</XdTable>
<!-- 确认组批次完成 弹窗 -->
<el-dialog
@ -258,10 +280,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: "EmisTmsSiteBatchMiss",
components: {
ProblemTypeMultiplePicker,
elDateAdvPicker,
emisTransPlanRuleForm,
EmisSupplierPicker,
@ -324,8 +348,13 @@ export default {
endDate: null,
remark: null,
delFlag: null,
missCount:null,
sendSiteCode:null
missCount: null,
sendSiteCode: null,
blSign:null,
params: {
problemQueryType: null,
problemQueryIds: null
}
},
billCodeList:[] // 选中的单号
};

34
src/views/emis/emisTmsSiteBatchMiss/indexV2.vue
View File

@ -89,7 +89,21 @@
<el-form-item :label="$t('录入人')" prop="registerManName">
<EmpNamePicker5 :placeholder="$t('请选择')" v-model="queryParams.registerManName" ></EmpNamePicker5>
</el-form-item>
<el-form-item label="问题件方式" prop="params.problemQueryType" label-width="90px">
<el-select clearable="" v-model="queryParams.params.problemQueryType" placeholder="请选择">
<el-option label="只查问题件类型" :value="1"></el-option>
<el-option label="剔除问题件类型" :value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="问题件类型" prop="params.problemQueryIds" label-width="90px">
<ProblemTypeMultiplePicker v-model="queryParams.params.problemQueryIds" ></ProblemTypeMultiplePicker>
</el-form-item>
<el-form-item label="签收状态" prop="blSign">
<el-select clearable v-model="queryParams.blSign" placeholder="请选择">
<el-option label="已签收" :value="1"></el-option>
<el-option label="未签收" :value="0"></el-option>
</el-select>
</el-form-item>
</SearchForm>
<XdTable
@ -218,6 +232,15 @@
<span v-if="scope.row.blManual==3">无需组批次</span>
</template>
</el-table-column>
<el-table-column :label="$t('签收状态')" align="center" prop="blSign" width="80" >
<template slot-scope="scope">
<el-tag v-if="scope.row.blSign=='1'" type="success">已签收</el-tag>
<el-tag v-else type="danger">未签收</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('问题件类型')" align="center" prop="problemTypeName" width="120" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" width="120" :show-overflow-tooltip="true"/>
</XdTable>
@ -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:[] // 选中的单号
};

8
src/views/emis/salesCommissionRatio/index.vue
View File

@ -53,7 +53,7 @@
<el-table-column label="销售主管占比" align="left" prop="salesExecutiveRatio" :show-overflow-tooltip="true"
min-width="80">
<template slot-scope="scope">
{{scope.row.salesExecutiveRatio}}%
{{scope.row.salesExecutiveRatio?scope.row.salesExecutiveRatio+ '%':''}}
</template>
</el-table-column>
<el-table-column label="销售联系人" align="left" prop="salesmen" :show-overflow-tooltip="true" min-width="80">
@ -61,14 +61,14 @@
<el-table-column label="销售联系人占比" align="center" key="deptName" prop="salesmenRatio" :show-overflow-tooltip="true"
min-width="100" >
<template slot-scope="scope">
{{scope.row.salesmenRatio}}%
{{scope.row.salesmenRatio?scope.row.salesmenRatio+ '%':''}}
</template>
</el-table-column>
<el-table-column label="销售支持" align="center" prop="salesSupport" min-width="100">
</el-table-column>
<el-table-column label="销售支持占比" align="center" prop="salesSupportRatio" min-width="100">
<template slot-scope="scope">
{{scope.row.salesSupportRatio}}%
{{scope.row.salesSupportRatio?scope.row.salesSupportRatio+ '%':''}}
</template>
</el-table-column>
<el-table-column label="启用状态" align="center" prop="status" min-width="100">
@ -134,6 +134,8 @@ export default {
selectionList: null,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
salesExecutive: null,
salesSupport: null,
salesmen: null,