wilson
/
ccl-lnj-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
zelian_wu 2 years ago
parent
8f3c82dea2 fa723dfff4
commit
07822f7e8b
6 changed files with 67 additions and 131 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      src/views/modules/material/seekByNum.vue
  2. 4
      src/views/modules/material/seekByRolls.vue
  3. 22
      src/views/modules/material/seekByTrans.vue
  4. 29
      src/views/modules/material/seekInvByRolls.vue
  5. 31
      src/views/modules/scheduleReport/com_separate_roll.vue
  6. 90
      src/views/modules/scheduleReport/produce_order.vue

22
src/views/modules/material/seekByNum.vue
View File

@ -183,7 +183,7 @@ export default {
serialNumber: '200005TableWarehouseId', serialNumber: '200005TableWarehouseId',
tableId: "200005Table", tableId: "200005Table",
tableName: "仓位编码", tableName: "仓位编码",
columnWidth: 130,
columnWidth: 145,
columnProp: 'warehouseID', columnProp: 'warehouseID',
headerAlign: 'left', headerAlign: 'left',
align: "left", align: "left",
@ -201,7 +201,7 @@ export default {
serialNumber: '200005TablePartNo', serialNumber: '200005TablePartNo',
tableId: "200005Table", tableId: "200005Table",
tableName: "物料编码", tableName: "物料编码",
columnWidth: 130,
columnWidth: 145,
columnProp: 'partNo', columnProp: 'partNo',
headerAlign: 'left', headerAlign: 'left',
align: "left", align: "left",
@ -219,7 +219,7 @@ export default {
serialNumber: '200005TablePartDesc', serialNumber: '200005TablePartDesc',
tableId: "200005Table", tableId: "200005Table",
tableName: "料号描述", tableName: "料号描述",
columnWidth: 130,
columnWidth: 145,
columnProp: 'partDesc', columnProp: 'partDesc',
headerAlign: 'left', headerAlign: 'left',
align: "left", align: "left",
@ -237,7 +237,7 @@ export default {
serialNumber: '200005TableNum', serialNumber: '200005TableNum',
tableId: "200005Table", tableId: "200005Table",
tableName: "卷数量", tableName: "卷数量",
columnWidth: 130,
columnWidth: 145,
columnProp: 'num', columnProp: 'num',
headerAlign: 'right', headerAlign: 'right',
align: "right", align: "right",
@ -255,7 +255,7 @@ export default {
serialNumber: '200005TableQtyOnHand', serialNumber: '200005TableQtyOnHand',
tableId: "200005Table", tableId: "200005Table",
tableName: "库存数量", tableName: "库存数量",
columnWidth: 130,
columnWidth: 145,
columnProp: 'qtyOnHand', columnProp: 'qtyOnHand',
headerAlign: 'right', headerAlign: 'right',
align: "right", align: "right",
@ -274,7 +274,7 @@ export default {
serialNumber: '200005TableBatchNo', serialNumber: '200005TableBatchNo',
tableId: "200005Table", tableId: "200005Table",
tableName: "批号", tableName: "批号",
columnWidth: 130,
columnWidth: 145,
columnProp: 'batchNo', columnProp: 'batchNo',
headerAlign: 'left', headerAlign: 'left',
align: "left", align: "left",
@ -292,7 +292,7 @@ export default {
serialNumber: '200005TableLocationID', serialNumber: '200005TableLocationID',
tableId: "200005Table", tableId: "200005Table",
tableName: "库位", tableName: "库位",
columnWidth: 130,
columnWidth: 145,
columnProp: 'locationID', columnProp: 'locationID',
headerAlign: 'left', headerAlign: 'left',
align: "left", align: "left",
@ -310,7 +310,7 @@ export default {
serialNumber: '200005TableManufactureDate', serialNumber: '200005TableManufactureDate',
tableId: "200005Table", tableId: "200005Table",
tableName: "生产日期", tableName: "生产日期",
columnWidth: 130,
columnWidth: 145,
columnProp: 'manufactureDate', columnProp: 'manufactureDate',
headerAlign: 'center', headerAlign: 'center',
align: "center", align: "center",
@ -328,7 +328,7 @@ export default {
serialNumber: '200005TableFirstInDate', serialNumber: '200005TableFirstInDate',
tableId: "200005Table", tableId: "200005Table",
tableName: "首次入库日期", tableName: "首次入库日期",
columnWidth: 130,
columnWidth: 145,
columnProp: 'FirstInDate', columnProp: 'FirstInDate',
headerAlign: 'center', headerAlign: 'center',
align: "center", align: "center",
@ -346,7 +346,7 @@ export default {
serialNumber: '200005TableExpiredDate', serialNumber: '200005TableExpiredDate',
tableId: "200005Table", tableId: "200005Table",
tableName: "失效日期", tableName: "失效日期",
columnWidth: 130,
columnWidth: 145,
columnProp: 'expiredDate', columnProp: 'expiredDate',
headerAlign: 'center', headerAlign: 'center',
align: "center", align: "center",
@ -364,7 +364,7 @@ export default {
serialNumber: '200005TableDaysUntilExpired', serialNumber: '200005TableDaysUntilExpired',
tableId: "200005Table", tableId: "200005Table",
tableName: "剩余有效期天数", tableName: "剩余有效期天数",
columnWidth: 130,
columnWidth: 140,
columnProp: 'daysUntilExpired', columnProp: 'daysUntilExpired',
headerAlign: 'right', headerAlign: 'right',
align: "right", align: "right",

4
src/views/modules/material/seekByRolls.vue
View File

@ -17,6 +17,10 @@
<el-input v-model="searchData.rollNo" clearable style="width: 120px"></el-input> <el-input v-model="searchData.rollNo" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'出入库单号:'">
<el-input v-model="searchData.transNo" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="' '"> <el-form-item :label="' '">
<el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button> <el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button>
<!-- <download-excel--> <!-- <download-excel-->

22
src/views/modules/material/seekByTrans.vue
View File

@ -13,6 +13,10 @@
<el-input v-model="searchData.partDesc" clearable style="width: 120px"></el-input> <el-input v-model="searchData.partDesc" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'出入库单号:'">
<el-input v-model="searchData.transNo" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="' '"> <el-form-item :label="' '">
<el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button> <el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button>
@ -272,24 +276,6 @@ export default {
status: true, status: true,
fixed: '', fixed: '',
}, },
// {
// userId: this.$store.state.user.name,
// functionId: 200003,
// serialNumber: '200003TableRollNo',
// tableId: "200003Table",
// tableName: "卷号",
// columnWidth: 100,
// columnProp: 'rollNo',
// headerAlign: 'center',
// align: "center",
// columnLabel: '卷号',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 200003, functionId: 200003,

29
src/views/modules/material/seekInvByRolls.vue
View File

@ -17,6 +17,13 @@
<el-input v-model="searchData.rollNo" clearable style="width: 120px"></el-input> <el-input v-model="searchData.rollNo" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'查询在库或全部:'">
<el-select v-model="searchData.qtyOnHand" placeholder="请选择" style="width: 120px">
<el-option label="在库" value= 0></el-option>
<el-option label="全部" value=""></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item :label="'卷号:'">--> <!-- <el-form-item :label="'卷号:'">-->
<!-- <el-input v-model="searchData.rollNo" clearable style="width: 120px"></el-input>--> <!-- <el-input v-model="searchData.rollNo" clearable style="width: 120px"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
@ -157,7 +164,7 @@ export default {
serialNumber: '200005TableWarehouseId', serialNumber: '200005TableWarehouseId',
tableId: "200005Table", tableId: "200005Table",
tableName: "仓位编码", tableName: "仓位编码",
columnWidth: 130,
columnWidth: 142,
columnProp: 'warehouseID', columnProp: 'warehouseID',
headerAlign: 'left', headerAlign: 'left',
align: "left", align: "left",
@ -175,7 +182,7 @@ export default {
serialNumber: '200005TablePartNo', serialNumber: '200005TablePartNo',
tableId: "200005Table", tableId: "200005Table",
tableName: "物料编码", tableName: "物料编码",
columnWidth: 130,
columnWidth: 142,
columnProp: 'partNo', columnProp: 'partNo',
headerAlign: 'left', headerAlign: 'left',
align: "left", align: "left",
@ -193,7 +200,7 @@ export default {
serialNumber: '200005TablePartDesc', serialNumber: '200005TablePartDesc',
tableId: "200005Table", tableId: "200005Table",
tableName: "料号描述", tableName: "料号描述",
columnWidth: 130,
columnWidth: 142,
columnProp: 'partDesc', columnProp: 'partDesc',
headerAlign: 'left', headerAlign: 'left',
align: "left", align: "left",
@ -211,7 +218,7 @@ export default {
serialNumber: '200004TableRollNo', serialNumber: '200004TableRollNo',
tableId: "200004Table", tableId: "200004Table",
tableName: "卷号", tableName: "卷号",
columnWidth: 100,
columnWidth: 145,
columnProp: 'rollNo', columnProp: 'rollNo',
headerAlign: 'center', headerAlign: 'center',
align: "center", align: "center",
@ -229,7 +236,7 @@ export default {
serialNumber: '200005TableQtyOnHand', serialNumber: '200005TableQtyOnHand',
tableId: "200005Table", tableId: "200005Table",
tableName: "库存数量", tableName: "库存数量",
columnWidth: 130,
columnWidth: 145,
columnProp: 'qtyOnHand', columnProp: 'qtyOnHand',
headerAlign: 'right', headerAlign: 'right',
align: "right", align: "right",
@ -248,7 +255,7 @@ export default {
serialNumber: '200005TableBatchNo', serialNumber: '200005TableBatchNo',
tableId: "200005Table", tableId: "200005Table",
tableName: "批号", tableName: "批号",
columnWidth: 130,
columnWidth: 145,
columnProp: 'batchNo', columnProp: 'batchNo',
headerAlign: 'left', headerAlign: 'left',
align: "left", align: "left",
@ -266,7 +273,7 @@ export default {
serialNumber: '200005TableLocationID', serialNumber: '200005TableLocationID',
tableId: "200005Table", tableId: "200005Table",
tableName: "库位", tableName: "库位",
columnWidth: 130,
columnWidth: 145,
columnProp: 'locationID', columnProp: 'locationID',
headerAlign: 'left', headerAlign: 'left',
align: "left", align: "left",
@ -284,7 +291,7 @@ export default {
serialNumber: '200005TableManufactureDate', serialNumber: '200005TableManufactureDate',
tableId: "200005Table", tableId: "200005Table",
tableName: "生产日期", tableName: "生产日期",
columnWidth: 130,
columnWidth: 145,
columnProp: 'manufactureDate', columnProp: 'manufactureDate',
headerAlign: 'center', headerAlign: 'center',
align: "center", align: "center",
@ -302,7 +309,7 @@ export default {
serialNumber: '200005TableFirstInDate', serialNumber: '200005TableFirstInDate',
tableId: "200005Table", tableId: "200005Table",
tableName: "首次入库日期", tableName: "首次入库日期",
columnWidth: 130,
columnWidth: 145,
columnProp: 'FirstInDate', columnProp: 'FirstInDate',
headerAlign: 'center', headerAlign: 'center',
align: "center", align: "center",
@ -320,7 +327,7 @@ export default {
serialNumber: '200005TableExpiredDate', serialNumber: '200005TableExpiredDate',
tableId: "200005Table", tableId: "200005Table",
tableName: "失效日期", tableName: "失效日期",
columnWidth: 130,
columnWidth: 145,
columnProp: 'expiredDate', columnProp: 'expiredDate',
headerAlign: 'center', headerAlign: 'center',
align: "center", align: "center",
@ -338,7 +345,7 @@ export default {
serialNumber: '200005TableDaysUntilExpired', serialNumber: '200005TableDaysUntilExpired',
tableId: "200005Table", tableId: "200005Table",
tableName: "剩余有效期天数", tableName: "剩余有效期天数",
columnWidth: 130,
columnWidth: 145,
columnProp: 'daysUntilExpired', columnProp: 'daysUntilExpired',
headerAlign: 'right', headerAlign: 'right',
align: "right", align: "right",

31
src/views/modules/scheduleReport/com_separate_roll.vue
View File

@ -6,6 +6,13 @@
<el-form :inline="true" label-position="top" style="height: 100px;" <el-form :inline="true" label-position="top" style="height: 100px;"
label-width="80px"> label-width="80px">
<!-- 半成品卷卷号 --> <!-- 半成品卷卷号 -->
<el-row>
<el-col :span="24" style="margin-top: -5px;">
<el-form-item label="材料卷号:">
<el-input ref="rmRollNo" v-model="pageData.rmRollNo" style="width: 180px;" @keyup.enter.native="checkRmRollNo" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="24" style="margin-top: -5px;"> <el-col :span="24" style="margin-top: -5px;">
<el-form-item :label=labels.rollQty> <el-form-item :label=labels.rollQty>
@ -64,6 +71,7 @@ export default {
username: this.$store.state.user.name, username: this.$store.state.user.name,
orderNo: '', orderNo: '',
itemNo: '', itemNo: '',
rmRollNo: '',
seqNo: '', seqNo: '',
rollNo: '', rollNo: '',
reportDate: '', reportDate: '',
@ -195,10 +203,11 @@ export default {
this.getSeqStandardRollQtyFun(); this.getSeqStandardRollQtyFun();
//清空参数 //清空参数
this.pageData.rollNums = 1; this.pageData.rollNums = 1;
this.pageData.rmRollNo = '';
this.visible = true; this.visible = true;
//获取焦点 //获取焦点
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.rollQty.focus();
this.$refs.rmRollNo.focus();
}); });
this.titleCon = this.labels.titleCon;//重置标题 this.titleCon = this.labels.titleCon;//重置标题
}, },
@ -246,8 +255,28 @@ export default {
} }
}, },
/*检查材料卷号的数据*/
checkRmRollNo() {
//判断null和空字符串
if (this.pageData.rmRollNo == null || this.pageData.rmRollNo == '') {
this.$message.error('卷号不能为空!');
return false;
} else {
//分拆site 和 卷号
let siteAndRollNo = this.pageData.rmRollNo.trim().split(',');
//判断材料卷号是否合规
if(siteAndRollNo.length != 2){
this.$message.error('材料卷号非法!');
return false;
}
this.pageData.rmRollNo = siteAndRollNo[1];
}
this.pageData.rollNo = this.pageData.rmRollNo;
},
//检查创建 //检查创建
createSeparateRollFun() { createSeparateRollFun() {
let rmRollNo = this.pageData.rmRollNo;
//获取当前是的数量 //获取当前是的数量
let rollQty = parseInt(this.pageData.rollQty); let rollQty = parseInt(this.pageData.rollQty);
//判断是否可以修改 //判断是否可以修改

90
src/views/modules/scheduleReport/produce_order.vue
View File

@ -205,24 +205,6 @@ export default {
status: true, status: true,
fixed: '' fixed: ''
}, },
{
userId: this.$store.state.user.name,
functionId: functionId,
serialNumber: '600001ProduceQtyReported',
tableId: '600001Produce',
tableName: '待生产工单',
columnProp: 'qtyReported',
headerAlign: 'center',
align: 'right',
columnLabel: '已报告数量',
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: ''
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: functionId, functionId: functionId,
@ -259,78 +241,6 @@ export default {
status: true, status: true,
fixed: '' fixed: ''
}, },
{
userId: this.$store.state.user.name,
functionId: functionId,
serialNumber: '600001ProduceRemark',
tableId: '600001Produce',
tableName: '待生产工单',
columnProp: 'remark',
headerAlign: 'center',
align: 'center',
columnLabel: '备注',
columnWidth: 180,
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: ''
},
{
userId: this.$store.state.user.name,
functionId: functionId,
serialNumber: '600001ProduceScheduledDate',
tableId: '600001Produce',
tableName: '待生产工单',
columnProp: 'scheduledDate',
headerAlign: 'center',
align: 'center',
columnLabel: '排产日期',
columnWidth: 120,
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: ''
},
{
userId: this.$store.state.user.name,
functionId: functionId,
serialNumber: '600001ProduceShiftNo',
tableId: '600001Produce',
tableName: '待生产工单',
columnProp: 'shiftNo',
headerAlign: 'center',
align: 'center',
columnLabel: '班次',
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: ''
},
{
userId: this.$store.state.user.name,
functionId: functionId,
serialNumber: '600001ProduceCustomerName',
tableId: '600001Produce',
tableName: '待生产工单',
columnProp: 'customerName',
headerAlign: 'center',
align: 'center',
columnLabel: '客户名称',
columnWidth: 180,
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: ''
},
], ],
reportButton: { reportButton: {
dieCuttingButton: true, dieCuttingButton: true,

Write Preview
Loading…
Cancel
Save