PG
/
Win.Sfs.SmartSettlementSystem.PG
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

红旗一汽轿车

branch_ccpg_220107
44673626 3 years ago
parent
91a3ba6a30
commit
2b221790d4
2 changed files with 64 additions and 147 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 207
      vue/src/views/ux/vw/dataInput/hq_h_report/index.vue
  2. 4
      vue/src/views/ux/vw/dataInput/hq_y/index.vue

207
vue/src/views/ux/vw/dataInput/hq_h_report/index.vue
View File

@ -106,33 +106,6 @@
</template>
</el-table-column>
<!-- 操作名称 -->
<!-- <el-table-column
prop="actionName"
label="操作名称(单击箭头过滤)"
width="165"
column-key="actionName"
:filters="[
{ text: '导出', value: '导出' },
{ text: '消息', value: '消息' },
]"
filter-placement="bottom-end"
:filter-method="filterHandler"
>
<template slot-scope="scope">
<div align="center">
<el-tag
v-for="(item, index) in menuCateMap"
v-show="scope.row.actionName == item.value"
:key="index"
:type="item.cssName"
>
{{ item.label }}
</el-tag>
</div>
</template>
</el-table-column> -->
<!-- 状态 -->
<el-table-column
prop="stateName"
label="状态(单击箭头过滤)"
@ -230,7 +203,7 @@
<el-col :md="4" :xs="24">
<el-form-item label="选择版本" required />
</el-col>
<el-col :md="20" :xs="24" style="margin-left: -80px">
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item prop="versionValue">
<el-select
v-model="formCount.versionValue"
@ -248,6 +221,22 @@
</el-select>
</el-form-item>
</el-col>
<el-col :md="4" :xs="24">
<el-form-item label="发货状态" style="margin-left: 10px" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -110px">
<el-form-item prop="BillStatus">
<el-select
size="medium"
v-model="formCount.BillStatus"
placeholder="请选择"
style="width: 188px; margin-right: 25px"
>
<el-option label="未发货" :value="1"></el-option>
<el-option label="已发货" :value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
@ -261,7 +250,7 @@
multiple
filterable
clearable
style="width: 380px; margin-right: 15px"
style="width: 450px; margin-right: 15px"
@change="valueChange"
placeholder="请选择"
>
@ -277,66 +266,43 @@
}}</span>
</el-option>
</el-select>
<!-- <el-select
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="收货仓库描述" />
</el-col>
<el-col :md="20" :xs="24" style="margin-left: -80px">
<el-form-item prop="materialGroupValue">
<el-select
v-model="formCount.materialGroupValue"
class="my-el-select"
style="width: 350px; margin-right: 15px"
size="medium"
multiple
filterable
clearable
style="width: 450px; margin-right: 15px"
@change="valueChange"
placeholder="请选择"
>
<el-option
v-for="item in materialGroupList"
:key="item.label"
:key="item.value"
:label="item.value"
:value="item.label"
:value="item.value"
>
<span style="float: left">{{ item.label }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{
item.value
}}</span>
</el-option>
</el-select> -->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="CP5时间：" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item>
<el-date-picker
v-model="cp5startTime"
:picker-options="pickerOptions2"
type="datetime"
size="small"
@change="getdateValueCp5"
value-format="yyyy-MM-dd HH:mm:ss"
default-time="00:00:00"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -40px">
<el-form-item>
<el-date-picker
v-model="cp5endTime"
:picker-options="pickerOptions3"
type="datetime"
size="small"
@change="getdateValCp5"
value-format="yyyy-MM-dd HH:mm:ss"
default-time="23:59:59"
>
</el-date-picker>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="CP7时间：" />
<el-form-item label="交货日期" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item prop="startTime">
@ -371,45 +337,15 @@
<el-collapse v-model="activeNames">
<el-collapse-item name="1">
<template slot="title">
其他搜索条件(单击折叠或伸展)<i
其他搜索条件(单击折叠或展开)<i
class="header-icon el-icon-info"
style="color: #37b328"
></i>
</template>
<!-- <el-row>
<el-col :md="4" :xs="24">
<el-form-item label="KEEN号" />
</el-col>
<el-col :md="18" :xs="24" style="margin-left: -80px">
<el-form-item prop="kennCode">
<el-input
type="textarea"
v-model="formCount.kennCode"
style="width: 380px"
:rows="4"
placeholder="多个KENN号，请以回车换行形式添加！"
/>
</el-form-item>
</el-col>
<el-col :md="2" :xs="24">
<el-tooltip
content="一键复制粘贴"
placement="bottom"
effect="light"
>
<el-button
type="primary"
icon="el-icon-edit"
circle
@click="kennBtn"
></el-button>
</el-tooltip>
</el-col>
</el-row> -->
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="KEEN号" />
<el-form-item label="订货看板编号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item prop="kennCode">
@ -418,12 +354,12 @@
v-model="formCount.kennCode"
style="width: 170px"
:rows="4"
placeholder="多个KENN号，请以回车换行形式添加！"
placeholder="多个订货看板编号，请以回车换行形式添加！"
/>
</el-form-item>
</el-col>
<el-col :md="4" :xs="24">
<el-form-item label="底盘号" />
<el-form-item label="发货零件号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item prop="chassisNumber">
@ -432,7 +368,7 @@
style="width: 170px"
type="textarea"
:rows="4"
placeholder="多个底盘号，请以回车换行形式添加！"
placeholder="多个发货零件号，请以回车换行形式添加！"
/>
</el-form-item>
</el-col>
@ -440,7 +376,7 @@
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="客户零件号" />
<el-form-item label="结算验收单号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item prop="materialCode">
@ -449,12 +385,12 @@
style="width: 170px"
type="textarea"
:rows="4"
placeholder="多个客户零件号，请以回车换行形式添加！"
placeholder="多个结算验收单号，请以回车换行形式添加！"
/>
</el-form-item>
</el-col>
<el-col :md="4" :xs="24">
<el-form-item label="厂内零件号" />
<el-form-item label="结算零件号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item prop="sapCode">
@ -463,6 +399,23 @@
style="width: 170px"
type="textarea"
:rows="4"
placeholder="多个结算零件号，请以回车换行形式添加！"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="SAP编号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item prop="sapCode">
<el-input
v-model="formCount.sapCode"
style="width: 450px"
type="textarea"
:rows="4"
placeholder="多个厂内零件号，请以回车换行形式添加！"
/>
</el-form-item>
@ -573,19 +526,6 @@ export default {
return time.getTime() <= new Date(this.startTime).getTime();
},
},
pickerOptions2: {
disabledDate: (time) => {
//if (this.endTime != "") {
return time.getTime() > new Date(this.cp5endTime).getTime();
//}
},
},
pickerOptions3: {
disabledDate: (time) => {
return time.getTime() <= new Date(this.cp5startTime).getTime();
},
},
pickerOptionsCp7: {
disabledDate: (time) => {
let now = new Date();
@ -637,8 +577,6 @@ export default {
formCount: {
startTime: "",
endTime: "",
cp5startTime: "",
cp5endTime: "",
// name: "未结算对比",
// settledate: "",
// materialCode: "",
@ -647,8 +585,6 @@ export default {
// kennCode: "",
// version: "",
},
cp5startTime: "",
cp5endTime: "",
dataKenCode: "",
datachassisNumber: "",
datamaterialCode: "",
@ -1129,15 +1065,6 @@ export default {
this.getbalanceIndexData();
},
//cp5
getdateValueCp5(val) {
this.cp5startTime = val;
this.getbalanceIndexData();
},
getdateValCp5(val) {
this.cp5endTime = val;
this.getbalanceIndexData();
},
getCurrentMonthFirst() {
var date = new Date();
date.setDate(1);
@ -1224,8 +1151,6 @@ export default {
this.datetime5 = [];
this.startTime = "";
this.endTime = "";
this.cp5startTime = "";
this.cp5endTime = "";
},
save() {
this.$refs.formCount.validate((valid) => {
@ -1241,16 +1166,10 @@ export default {
if (this.formCount.kennCode != "") {
this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
}
this.listExportQuery.begin = this.cp5startTime
? this.cp5startTime
: undefined;
this.listExportQuery.end = this.cp5endTime
? this.cp5endTime
: undefined;
this.listExportQuery.cp7Begin = this.startTime
this.listExportQuery.begin = this.startTime
? this.startTime
: undefined;
this.listExportQuery.cp7End = this.endTime ? this.endTime : undefined;
this.listExportQuery.end = this.endTime ? this.endTime : undefined;
if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
}
@ -1302,8 +1221,6 @@ export default {
this.datetime5 = [];
this.startTime = "";
this.endTime = "";
this.cp5startTime = "";
this.cp5endTime = "";
this.dialogFormVisible = true;
},
kennBtn() {

4
vue/src/views/ux/vw/dataInput/hq_y/index.vue
View File

@ -46,7 +46,7 @@
v-model="searchContent"
clearable
size="small"
placeholder="按照看板号搜索..."
placeholder="按照看板编号搜索..."
style="width: 200px"
class="search-container"
@keyup.enter.native="handleFilter"
@ -534,7 +534,7 @@ export default {
this.getList();
this.listQuery.Filters = [];
if (this.searchContent != "") {
var column = "btCarKanBan";
var column = "kanbanNumber";
let filter = {
logic: 0,
column: column,

Write Preview
Loading…
Cancel
Save