Browse Source

日常提交

branch_ccpg_220107
44673626 3 years ago
parent
commit
d1d004b70c
  1. 26
      vue/src/views/ux/billManage/WMSOutputDetailWithCodeReport/index.vue
  2. 6
      vue/src/views/ux/billManage/WMSOutputSumReport/index.vue
  3. 12
      vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue
  4. 2
      vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue
  5. 31
      vue/static/tableFieldForSearch.json

26
vue/src/views/ux/billManage/WMSOutputDetailWithCodeReport/index.vue

@ -19,6 +19,23 @@
>导出Excel
</el-button>
<!-- <el-select
v-model="selectType"
clearable
@change="SelectType"
placeholder="请选择"
style="width: 200px; margin-left: 8px"
>
<el-option label="大众准时化出库" value="大众准时化出库"></el-option>
<el-option label="大众看板出库" value="大众看板出库"></el-option>
<el-option
label="大众备件条码出库"
value="大众备件条码出库"
></el-option>
<el-option label="红旗看板出库" value="红旗看板出库"></el-option>
<el-option label="自定义发货出库" value="自定义发货出库"></el-option>
</el-select> -->
<el-input
v-model="searchContent"
clearable
@ -306,6 +323,11 @@ export default {
var tempsTabs = [];
tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 });
tempsTabs.push({
label: "版本号",
prop: "version",
width: 100,
});
tempsTabs.push({
label: "客户",
prop: "client",
@ -326,8 +348,8 @@ export default {
tempsTabs.push({ label: "结算单", prop: "billNum", width: 180 });
tempsTabs.push({ label: "结算数量", prop: "qty", width: 120 });
tempsTabs.push({ label: "实际出库数量", prop: "outputQty", width: 140 });
tempsTabs.push({ label: "差异数量", prop: "diffQty", width: 120 });
tempsTabs.push({
label: "开票单价",

6
vue/src/views/ux/billManage/WMSOutputSumReport/index.vue

@ -71,8 +71,8 @@
>
<el-option label="全部" :value="4"></el-option>
<el-option label="新建" :value="0"></el-option>
<el-option label="成功" :value="1"></el-option>
<el-option label="失败" :value="2"></el-option>
<el-option label="成功" :value="2"></el-option>
<el-option label="失败" :value="1"></el-option>
</el-select>
</el-form-item>
@ -875,7 +875,7 @@ export default {
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "state") {
return { 0: "新建", 1: "已申请", 2: "成功", 3: "失败" }[
return { 0: "新建", 2: "成功", 1: "失败" }[
row[column.property]
];
}

12
vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue

@ -291,12 +291,12 @@ export default {
width: 150,
});
tempsTabs.push({ label: "看板编号", prop: "kanban", width: 180 });
tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 150 });
tempsTabs.push({
label: "物料组(车型)",
prop: "materialGroup",
width: 220,
});
// tempsTabs.push({ label: "", prop: "wmsBillNum", width: 150 });
// tempsTabs.push({
// label: "()",
// prop: "materialGroup",
// width: 220,
// });
tempsTabs.push({
label: "SAP零件号",
prop: "sapMaterialCode",

2
vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue

@ -510,7 +510,7 @@ export default {
}
//this.listOutPutQuery.accountDate = this.accountDatelist;
console.log(
"一轿车-确认出库条件:" + JSON.stringify(this.listOutPutQuery)
"一次性销售-确认出库条件:" + JSON.stringify(this.listOutPutQuery)
);
this.$axios

31
vue/static/tableFieldForSearch.json

@ -3187,6 +3187,34 @@
"wmsOutputDetailWithCodeReport": {
"id": "36",
"data": [
{
"fieldId": 3,
"formType": "text",
"name": "版本号",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "version",
"setting": []
},
{
"fieldId": 2,
"formType": "select",
"isNull": 0,
"name": "出库类型",
"options": "",
"type": 3,
"value": "",
"fieldType": 0,
"fieldName": "type",
"setting": [
"大众准时化出库,大众准时化出库",
"大众看板出库,大众看板出库",
"大众备件条码出库,大众备件条码出库",
"红旗看板出库,红旗看板出库",
"自定义发货出库,自定义发货出库"
]
},
{
"fieldId": 3,
"formType": "text",
@ -3253,8 +3281,7 @@
"setting": []
}
]
}
,
},
"wmsOutputCancelDiffReport": {
"id": "36",
"data": [

Loading…
Cancel
Save