|
|
@@ -25,7 +25,7 @@
|
|
|
<el-input
|
|
|
v-model="filterForm.data.Gmid"
|
|
|
style="width: 100%;"
|
|
|
- refcous="true"
|
|
|
+ refcous="true"
|
|
|
clearable
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
@@ -67,24 +67,24 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="3">
|
|
|
- <el-form-item label="工序">
|
|
|
- <el-select
|
|
|
- filterable
|
|
|
- collapse-tags
|
|
|
- v-model="filterForm.data.workprocid"
|
|
|
- placeholder=""
|
|
|
- style="width: 100%;"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item of nameObj.workprocid.arr"
|
|
|
- :key="item.id"
|
|
|
- :value="item.id"
|
|
|
- :label="item.name"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-form-item label="工序">
|
|
|
+ <el-select
|
|
|
+ filterable
|
|
|
+ collapse-tags
|
|
|
+ v-model="filterForm.data.workprocid"
|
|
|
+ placeholder=""
|
|
|
+ style="width: 100%;"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item of nameObj.workprocid.arr"
|
|
|
+ :key="item.id"
|
|
|
+ :value="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
@@ -112,21 +112,21 @@
|
|
|
:label="item.name"
|
|
|
:value="item.id">
|
|
|
</el-option>
|
|
|
- </el-select>
|
|
|
- <el-button
|
|
|
- class="button"
|
|
|
- type="primary"
|
|
|
- size="mini"
|
|
|
- icon="el-icon-edit-outline"
|
|
|
- @click="but_update"
|
|
|
- :loading="loading"
|
|
|
- v-privilege="activeMenu + 'PUT'"
|
|
|
- >修改轮次描述</el-button>
|
|
|
- <el-switch
|
|
|
- v-model="leftIssueShow"
|
|
|
- active-text="显示全部"
|
|
|
- inactive-text="隐藏已下发"
|
|
|
- @change="leftIssueShowChange">
|
|
|
+ </el-select>
|
|
|
+ <el-button
|
|
|
+ class="button"
|
|
|
+ type="primary"
|
|
|
+ size="mini"
|
|
|
+ icon="el-icon-edit-outline"
|
|
|
+ @click="but_update"
|
|
|
+ :loading="loading"
|
|
|
+ v-privilege="activeMenu + 'PUT'"
|
|
|
+ >修改轮次描述</el-button>
|
|
|
+ <el-switch
|
|
|
+ v-model="leftIssueShow"
|
|
|
+ active-text="显示全部"
|
|
|
+ inactive-text="隐藏已下发"
|
|
|
+ @change="leftIssueShowChange">
|
|
|
</el-switch>
|
|
|
<div style="float:right; text-align: right;">
|
|
|
<el-radio-group v-model="radio" @change="radioChange()">
|
|
|
@@ -478,7 +478,7 @@
|
|
|
clearable
|
|
|
v-model="rightTableObj[scope.row.seq].grades"
|
|
|
@keydown.native="keyDown" :id="scope.$index + scope.column.id"
|
|
|
- placeholder=""
|
|
|
+ placeholder=""
|
|
|
@change = "((data) =>{gradesChange(data,scope)})"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -543,7 +543,7 @@
|
|
|
style="width: 100%;"
|
|
|
v-model="rightTableObj[scope.row.seq].planWeight"
|
|
|
@keydown.native="keyDown" :id="scope.$index + scope.column.id"
|
|
|
- refcous="true"
|
|
|
+ refcous="true"
|
|
|
clearable
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
@@ -849,63 +849,63 @@
|
|
|
:loading="loading"
|
|
|
>保 存</el-button>
|
|
|
</span>
|
|
|
- </el-dialog>
|
|
|
- <el-dialog
|
|
|
- title="高线轮次描述-修改"
|
|
|
- :visible.sync="dialog.editorBox3.show"
|
|
|
- width="400px"
|
|
|
- :close-on-click-modal="false"
|
|
|
- :show-close="!loading">
|
|
|
- <div>
|
|
|
- <div class="lastData">查询到工序 <el-tag size="medium">
|
|
|
- {{ nameObj.workprocid.obj[lastIssuedData.arr[0].workprocType] ?
|
|
|
- nameObj.workprocid.obj[lastIssuedData.arr[0].workprocType].name :
|
|
|
- lastIssuedData.arr[0].workprocType }}</el-tag> 最近一次下发的数据：
|
|
|
- <div>轮次计划 <el-tag size="small">{{lastIssuedData.arr[0].id}}</el-tag></div>
|
|
|
- <div>国贸订单 <el-tag size="small">{{lastIssuedData.arr[0].parentid}}</el-tag></div>
|
|
|
- <div>下发时间 <el-tag size="small">{{lastIssuedData.arr[0].issuedTime}}</el-tag></div>
|
|
|
- <div>轮次描述 <el-tag size="small">{{lastIssuedData.arr[0].describe}}</el-tag></div>
|
|
|
- </div>
|
|
|
- <el-form
|
|
|
- :model="dialog.editorBox3.form.data"
|
|
|
- ref="dialog_form3"
|
|
|
- size="mini"
|
|
|
- label-width="300px"
|
|
|
- >
|
|
|
- <el-row>
|
|
|
- <el-col>
|
|
|
- <el-col :span="20">
|
|
|
- <el-form-item
|
|
|
- label="轮次描述"
|
|
|
- prop="describe"
|
|
|
- label-width="100px"
|
|
|
- :rules="dialog.editorBox3.form.rules.describe"
|
|
|
- >
|
|
|
- <el-input clearable
|
|
|
- style="width: 100%;"
|
|
|
- v-model="dialog.editorBox3.form.data.describe"
|
|
|
- refcous="true"
|
|
|
- ></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- </el-form>
|
|
|
- </div>
|
|
|
- <span
|
|
|
- slot="footer"
|
|
|
- class="dialog-footer"
|
|
|
- >
|
|
|
- <el-button
|
|
|
- :loading="loading"
|
|
|
- @click="dialog.editorBox3.show = false"
|
|
|
- >取 消</el-button>
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- @click="but_copy"
|
|
|
- :loading="loading"
|
|
|
- >保 存</el-button>
|
|
|
- </span>
|
|
|
+ </el-dialog>
|
|
|
+ <el-dialog
|
|
|
+ title="高线轮次描述-修改"
|
|
|
+ :visible.sync="dialog.editorBox3.show"
|
|
|
+ width="400px"
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ :show-close="!loading">
|
|
|
+ <div>
|
|
|
+ <div class="lastData">查询到工序 <el-tag size="medium">
|
|
|
+ {{ nameObj.workprocid.obj[lastIssuedData.arr[0].workprocType] ?
|
|
|
+ nameObj.workprocid.obj[lastIssuedData.arr[0].workprocType].name :
|
|
|
+ lastIssuedData.arr[0].workprocType }}</el-tag> 最近一次下发的数据：
|
|
|
+ <div>轮次计划 <el-tag size="small">{{lastIssuedData.arr[0].id}}</el-tag></div>
|
|
|
+ <div>国贸订单 <el-tag size="small">{{lastIssuedData.arr[0].parentid}}</el-tag></div>
|
|
|
+ <div>下发时间 <el-tag size="small">{{lastIssuedData.arr[0].issuedTime}}</el-tag></div>
|
|
|
+ <div>轮次描述 <el-tag size="small">{{lastIssuedData.arr[0].describe}}</el-tag></div>
|
|
|
+ </div>
|
|
|
+ <el-form
|
|
|
+ :model="dialog.editorBox3.form.data"
|
|
|
+ ref="dialog_form3"
|
|
|
+ size="mini"
|
|
|
+ label-width="300px"
|
|
|
+ >
|
|
|
+ <el-row>
|
|
|
+ <el-col>
|
|
|
+ <el-col :span="20">
|
|
|
+ <el-form-item
|
|
|
+ label="轮次描述"
|
|
|
+ prop="describe"
|
|
|
+ label-width="100px"
|
|
|
+ :rules="dialog.editorBox3.form.rules.describe"
|
|
|
+ >
|
|
|
+ <el-input clearable
|
|
|
+ style="width: 100%;"
|
|
|
+ v-model="dialog.editorBox3.form.data.describe"
|
|
|
+ refcous="true"
|
|
|
+ ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-form>
|
|
|
+ </div>
|
|
|
+ <span
|
|
|
+ slot="footer"
|
|
|
+ class="dialog-footer"
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ :loading="loading"
|
|
|
+ @click="dialog.editorBox3.show = false"
|
|
|
+ >取 消</el-button>
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ @click="but_copy"
|
|
|
+ :loading="loading"
|
|
|
+ >保 存</el-button>
|
|
|
+ </span>
|
|
|
</el-dialog>
|
|
|
<zj-formulaEditor :equationEditing="dialog.equationEditing"></zj-formulaEditor>
|
|
|
</div>
|
|
|
@@ -976,10 +976,10 @@ export default {
|
|
|
pageNum1: 1,
|
|
|
pageSize1: 100,
|
|
|
total1: 0,
|
|
|
- singleTableHeight: 100,
|
|
|
+ singleTableHeight: 100,
|
|
|
leftIssueShow: false,
|
|
|
- leftTableData: [],
|
|
|
- leftTableDataObj: {},
|
|
|
+ leftTableData: [],
|
|
|
+ leftTableDataObj: {},
|
|
|
leftTableDataAll: [],
|
|
|
leftTableLoading: false,
|
|
|
leftTableWidth: 550,
|
|
|
@@ -1149,10 +1149,10 @@ export default {
|
|
|
name: '应急'
|
|
|
}
|
|
|
]
|
|
|
- },
|
|
|
- ExecutiveStandard: {
|
|
|
- obj: {},
|
|
|
- arr: []
|
|
|
+ },
|
|
|
+ ExecutiveStandard: {
|
|
|
+ obj: {},
|
|
|
+ arr: []
|
|
|
}
|
|
|
},
|
|
|
loading: false,
|
|
|
@@ -1221,30 +1221,30 @@ export default {
|
|
|
]
|
|
|
}
|
|
|
}
|
|
|
- },
|
|
|
- editorBox3: {
|
|
|
- show: false,
|
|
|
- type: '',
|
|
|
- form: {
|
|
|
- data: {
|
|
|
- describe: ''
|
|
|
- },
|
|
|
- rules: {
|
|
|
- describe: [{ required: true, message: '该项不能为空', trigger: 'change' }]
|
|
|
- }
|
|
|
- }
|
|
|
+ },
|
|
|
+ editorBox3: {
|
|
|
+ show: false,
|
|
|
+ type: '',
|
|
|
+ form: {
|
|
|
+ data: {
|
|
|
+ describe: ''
|
|
|
+ },
|
|
|
+ rules: {
|
|
|
+ describe: [{ required: true, message: '该项不能为空', trigger: 'change' }]
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
- },
|
|
|
- lastIssuedData: {
|
|
|
- obj: {},
|
|
|
- arr: [{
|
|
|
- id: '',
|
|
|
- parentid: '',
|
|
|
- describe: '',
|
|
|
- issuedTime: '',
|
|
|
- currentDescribe: '',
|
|
|
- workprocType: ''
|
|
|
- }]
|
|
|
+ },
|
|
|
+ lastIssuedData: {
|
|
|
+ obj: {},
|
|
|
+ arr: [{
|
|
|
+ id: '',
|
|
|
+ parentid: '',
|
|
|
+ describe: '',
|
|
|
+ issuedTime: '',
|
|
|
+ currentDescribe: '',
|
|
|
+ workprocType: ''
|
|
|
+ }]
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -1283,7 +1283,7 @@ export default {
|
|
|
// that.getPropertyIdData();
|
|
|
that.getGrades();
|
|
|
that.getSpecifications();
|
|
|
- that.getStandards();
|
|
|
+ that.getStandards();
|
|
|
that.getExecutiveStandard();
|
|
|
// that.getUnitIdData();
|
|
|
},
|
|
|
@@ -1423,7 +1423,7 @@ export default {
|
|
|
})
|
|
|
.then(function (res) {
|
|
|
if (res.code === '0') {
|
|
|
- let arr = [];
|
|
|
+ let arr = [];
|
|
|
let obj = {};
|
|
|
for (let i = 0; i < res.data.list.length; i++) {
|
|
|
let item = res.data.list[i];
|
|
|
@@ -1454,38 +1454,38 @@ export default {
|
|
|
kxf_weight: item.PLANWEIGHT - item.YXF_WEIGHT,
|
|
|
yxf_weight: item.YXF_WEIGHT,
|
|
|
tag: item.TAG ? item.TAG : '0'
|
|
|
- });
|
|
|
- obj[item.ID] = {seq: i,
|
|
|
- id: item.ID,
|
|
|
- jhTime: item.JHTIME,
|
|
|
- state: item.STATE,
|
|
|
- grades: item.GRADES,
|
|
|
- specifications: item.SPECIFICATIONS,
|
|
|
- lengths: item.LENGTHS,
|
|
|
- chemicalStandard: item.CHEMICALSTANDARD,
|
|
|
- surfaceStandard: item.SURFACESTANDARD,
|
|
|
- workprocType: item.WORKPROCTYPE,
|
|
|
- iateralarea: item.IATERALAREA,
|
|
|
- lengthtimeswidth: item.LENGTHTIMESWIDTH,
|
|
|
- transportType: item.TRANSPORTTYPE,
|
|
|
- receivetime: item.RECEIVETIME,
|
|
|
- createman: item.CREATEMAN,
|
|
|
- createtime: item.CREATETIME,
|
|
|
- updateman: item.UPDATEMAN,
|
|
|
- purpose: item.PURPOSE,
|
|
|
- updatetime: item.UPDATETIME,
|
|
|
- memo: item.MEMO,
|
|
|
- planweight: item.PLANWEIGHT,
|
|
|
- deliveryDate: item.DELIVERYDATE,
|
|
|
- dimension: item.DIMENSION,
|
|
|
- kxf_weight: item.PLANWEIGHT - item.YXF_WEIGHT,
|
|
|
- yxf_weight: item.YXF_WEIGHT,
|
|
|
- tag: item.TAG ? item.TAG : '0'
|
|
|
+ });
|
|
|
+ obj[item.ID] = {seq: i,
|
|
|
+ id: item.ID,
|
|
|
+ jhTime: item.JHTIME,
|
|
|
+ state: item.STATE,
|
|
|
+ grades: item.GRADES,
|
|
|
+ specifications: item.SPECIFICATIONS,
|
|
|
+ lengths: item.LENGTHS,
|
|
|
+ chemicalStandard: item.CHEMICALSTANDARD,
|
|
|
+ surfaceStandard: item.SURFACESTANDARD,
|
|
|
+ workprocType: item.WORKPROCTYPE,
|
|
|
+ iateralarea: item.IATERALAREA,
|
|
|
+ lengthtimeswidth: item.LENGTHTIMESWIDTH,
|
|
|
+ transportType: item.TRANSPORTTYPE,
|
|
|
+ receivetime: item.RECEIVETIME,
|
|
|
+ createman: item.CREATEMAN,
|
|
|
+ createtime: item.CREATETIME,
|
|
|
+ updateman: item.UPDATEMAN,
|
|
|
+ purpose: item.PURPOSE,
|
|
|
+ updatetime: item.UPDATETIME,
|
|
|
+ memo: item.MEMO,
|
|
|
+ planweight: item.PLANWEIGHT,
|
|
|
+ deliveryDate: item.DELIVERYDATE,
|
|
|
+ dimension: item.DIMENSION,
|
|
|
+ kxf_weight: item.PLANWEIGHT - item.YXF_WEIGHT,
|
|
|
+ yxf_weight: item.YXF_WEIGHT,
|
|
|
+ tag: item.TAG ? item.TAG : '0'
|
|
|
};
|
|
|
- }
|
|
|
- that.leftTableDataAll = arr;
|
|
|
+ }
|
|
|
+ that.leftTableDataAll = arr;
|
|
|
that.leftIssueShow = false;
|
|
|
- that.leftTableData = that.leftTableDataAll.filter(item => item.kxf_weight > 0);
|
|
|
+ that.leftTableData = that.leftTableDataAll.filter(item => item.kxf_weight > 0);
|
|
|
that.leftTableDataObj = obj;
|
|
|
that.total1 = res.data.total;
|
|
|
that.dialog.fRow = null;
|
|
|
@@ -1577,11 +1577,11 @@ export default {
|
|
|
ids.push(element.id);
|
|
|
});
|
|
|
that.pageNum = pageNum || that.pageNum;
|
|
|
- let url = 'pass/ems/v1/emsprodplanrounds/getTableDetailAsRadio/?pageNum=' + that.pageNum + '&pageSize=' + that.pageSize;
|
|
|
+ let url = 'pass/ems/v1/emsprodplanrounds/getTableDetailAsRadio/?pageNum=' + that.pageNum + '&pageSize=' + that.pageSize;
|
|
|
// state 是不等于
|
|
|
that.axios.get(url, {
|
|
|
params: {
|
|
|
- id: ids.join(','),
|
|
|
+ id: ids.join(','),
|
|
|
state: 2
|
|
|
}
|
|
|
}).then(function (res) {
|
|
|
@@ -1611,7 +1611,7 @@ export default {
|
|
|
sqno: item.sqno,
|
|
|
updatetime: item.updatetime,
|
|
|
workprocType: item.workprocType,
|
|
|
- auditState: item.auditState,
|
|
|
+ auditState: item.auditState,
|
|
|
tag: item.tag ? item.tag : '0'
|
|
|
});
|
|
|
}
|
|
|
@@ -1716,7 +1716,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
// 左边菜单选中
|
|
|
- handleSelectionChangeAsleft (val) {
|
|
|
+ handleSelectionChangeAsleft (val) {
|
|
|
let that = this;
|
|
|
let tableFormDataObj = {};
|
|
|
let arr = [];
|
|
|
@@ -1746,7 +1746,7 @@ export default {
|
|
|
that.multipleSelectionAscLeft = val;
|
|
|
},
|
|
|
// 右边菜单选中
|
|
|
- handleSelectionChange (val) {
|
|
|
+ handleSelectionChange (val) {
|
|
|
let that = this;
|
|
|
let rightTableObj = {};
|
|
|
let arr = [];
|
|
|
@@ -1769,23 +1769,23 @@ export default {
|
|
|
obj[key] = item[key];
|
|
|
}
|
|
|
item.realvalue = (!isNaN(Number(item.apportvalue)) && !isNaN(Number(item.wastage))) ? Number(item.apportvalue) + Number(item.wastage) - Number(item.secondVal) : item.realvalue;
|
|
|
- rightTableObj[xId] = obj;
|
|
|
- try {
|
|
|
- if (item.grades != null && item.grades !== '') {
|
|
|
- if (item.surfaceStandard === '' || item.surfaceStandard === null) {
|
|
|
- rightTableObj[xId].surfaceStandard = that.nameObj.ExecutiveStandard.obj[item.grades].surface;
|
|
|
- }
|
|
|
- if (item.chemicalStandard === '' || item.chemicalStandard === null) {
|
|
|
- if (item.grades === 'Q195' && item.specifications === '6.5') {
|
|
|
- rightTableObj[xId].chemicalStandard = that.nameObj.ExecutiveStandard.obj['Q195L'].factory;
|
|
|
- } else {
|
|
|
- rightTableObj[xId].chemicalStandard = that.nameObj.ExecutiveStandard.obj[item.grades].factory;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- } catch (e) {
|
|
|
- rightTableObj[xId].chemicalStandard = '';
|
|
|
- console.log('没有对应')
|
|
|
+ rightTableObj[xId] = obj;
|
|
|
+ try {
|
|
|
+ if (item.grades != null && item.grades !== '') {
|
|
|
+ if (item.surfaceStandard === '' || item.surfaceStandard === null) {
|
|
|
+ rightTableObj[xId].surfaceStandard = that.nameObj.ExecutiveStandard.obj[item.grades].surface;
|
|
|
+ }
|
|
|
+ if (item.chemicalStandard === '' || item.chemicalStandard === null) {
|
|
|
+ if (item.grades === 'Q195' && item.specifications === '6.5') {
|
|
|
+ rightTableObj[xId].chemicalStandard = that.nameObj.ExecutiveStandard.obj['Q195L'].factory;
|
|
|
+ } else {
|
|
|
+ rightTableObj[xId].chemicalStandard = that.nameObj.ExecutiveStandard.obj[item.grades].factory;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } catch (e) {
|
|
|
+ rightTableObj[xId].chemicalStandard = '';
|
|
|
+ console.log('没有对应')
|
|
|
}
|
|
|
}
|
|
|
item.isSelection = true;
|
|
|
@@ -1946,7 +1946,7 @@ export default {
|
|
|
},
|
|
|
getStandards () {
|
|
|
let that = this
|
|
|
- let url = 'pass/product/v1/emsstandard/getStandards?type=线材';
|
|
|
+ let url = 'pass/product/v1/emsstandard/getStandards?type=普线';
|
|
|
that.axios.get(url)
|
|
|
.then(function (res) {
|
|
|
if (res.code === '0') {
|
|
|
@@ -1971,7 +1971,7 @@ export default {
|
|
|
that.$refs['dialog_form_arr_2'].validate(async (valid, obj) => {
|
|
|
if (valid) {
|
|
|
let SubmitData = [];
|
|
|
- let auditStates = [];
|
|
|
+ let auditStates = [];
|
|
|
let messageRoundid = '';
|
|
|
for (let key in that.rightTableObj) {
|
|
|
SubmitData.push({
|
|
|
@@ -1996,35 +1996,35 @@ export default {
|
|
|
id: that.rightTableObj[key].roundid,
|
|
|
state: that.rightTableObj[key].state,
|
|
|
sqno: that.rightTableObj[key].sqno
|
|
|
- });
|
|
|
- try {
|
|
|
- if (that.rightTableObj[key].planWeight > that.leftTableDataObj[that.rightTableObj[key].parentid].kxf_weight) {
|
|
|
- messageRoundid += that.rightTableObj[key].roundid + ',';
|
|
|
- }
|
|
|
- } catch (e) {
|
|
|
- console.log(that.rightTableObj[key].parentid + '判断错误')
|
|
|
+ });
|
|
|
+ try {
|
|
|
+ if (that.rightTableObj[key].planWeight > that.leftTableDataObj[that.rightTableObj[key].parentid].kxf_weight) {
|
|
|
+ messageRoundid += that.rightTableObj[key].roundid + ',';
|
|
|
+ }
|
|
|
+ } catch (e) {
|
|
|
+ console.log(that.rightTableObj[key].parentid + '判断错误')
|
|
|
}
|
|
|
}
|
|
|
- that.loading = true;
|
|
|
- let down = false;
|
|
|
- if (messageRoundid !== '') {
|
|
|
- await that.$confirm('计划编号' + messageRoundid + '本次下发量已超出订单可下发量，是否继续下发?', '提示', {
|
|
|
- confirmButtonText: '确定',
|
|
|
- cancelButtonText: '取消',
|
|
|
- type: 'warning'
|
|
|
- }).then(() => {
|
|
|
- down = true;
|
|
|
- }).catch(() => {
|
|
|
- down = false;
|
|
|
- that.$message({
|
|
|
- type: 'info',
|
|
|
- message: '已取消下发'
|
|
|
- });
|
|
|
- that.loading = false;
|
|
|
- });
|
|
|
- } else {
|
|
|
- down = true;
|
|
|
- }
|
|
|
+ that.loading = true;
|
|
|
+ let down = false;
|
|
|
+ if (messageRoundid !== '') {
|
|
|
+ await that.$confirm('计划编号' + messageRoundid + '本次下发量已超出订单可下发量，是否继续下发?', '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
+ }).then(() => {
|
|
|
+ down = true;
|
|
|
+ }).catch(() => {
|
|
|
+ down = false;
|
|
|
+ that.$message({
|
|
|
+ type: 'info',
|
|
|
+ message: '已取消下发'
|
|
|
+ });
|
|
|
+ that.loading = false;
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ down = true;
|
|
|
+ }
|
|
|
if (down) {
|
|
|
await that.axios.post('pass/ems/v1/emsprodplanrounds/issue', SubmitData, {
|
|
|
contentType: 'application/json'
|
|
|
@@ -2044,7 +2044,7 @@ export default {
|
|
|
}).catch(function () {
|
|
|
that.loading = false;
|
|
|
});
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
} else {
|
|
|
@@ -2151,7 +2151,7 @@ export default {
|
|
|
let SubmitData = {
|
|
|
jhTime: that.dialog.editorBox.form.data.may,
|
|
|
planWeight: that.dialog.editorBox.form.data.planWeight,
|
|
|
- workprocType: that.dialog.editorBox.form.data.workprocid,
|
|
|
+ workprocType: that.dialog.editorBox.form.data.workprocid,
|
|
|
tag: '0'
|
|
|
};
|
|
|
that.$refs['dialog_form'].validate((valid) => {
|
|
|
@@ -2469,122 +2469,122 @@ export default {
|
|
|
openDetails (row) {
|
|
|
let that = this;
|
|
|
that.leftData = row;
|
|
|
- },
|
|
|
- getExecutiveStandard () {
|
|
|
- let that = this;
|
|
|
- let url = 'pass/ems/v1/emsproductsexecutivestandards/?pageNum=1&pageSize=999';
|
|
|
- that.axios.get(url)
|
|
|
- .then(function (res) {
|
|
|
- if (res.code === '0') {
|
|
|
- let arr = [];
|
|
|
- let obj = {};
|
|
|
- for (let item of res.data.list) {
|
|
|
- arr.push({
|
|
|
- brand: item.brand,
|
|
|
- factory: item.factoryStandard,
|
|
|
- surface: item.surfaceStandard
|
|
|
- });
|
|
|
- obj[item.brand] = {
|
|
|
- brand: item.brand,
|
|
|
- factory: item.factoryStandard,
|
|
|
- surface: item.surfaceStandard
|
|
|
- };
|
|
|
- }
|
|
|
- that.nameObj.ExecutiveStandard.arr = arr;
|
|
|
- that.nameObj.ExecutiveStandard.obj = obj;
|
|
|
- } else {
|
|
|
- that.$message.error(res.message);
|
|
|
- }
|
|
|
- });
|
|
|
- },
|
|
|
- gradesChange (data, scope) {
|
|
|
- let that = this;
|
|
|
- let obj = that.rightTableObj[scope.row.seq];
|
|
|
- // 化学成分执行标准 / 出厂执行标准
|
|
|
- let factory = obj.chemicalStandard;
|
|
|
- // 表面执行标准
|
|
|
- let surface = obj.surfaceStandard;
|
|
|
- // if(factory === '' || factory === null)
|
|
|
- // {
|
|
|
- try {
|
|
|
- obj.chemicalStandard = that.nameObj.ExecutiveStandard.obj[data].factory;
|
|
|
- if (data === 'Q195' && obj.specifications === '6.5') {
|
|
|
- obj.chemicalStandard = that.nameObj.ExecutiveStandard.obj['Q195L'].factory;
|
|
|
- // rightTableObj[xId].chemicalStandard = that.nameObj.ExecutiveStandard.obj['Q195L'].factory;
|
|
|
- }
|
|
|
- // }
|
|
|
- // if(surface === '' || surface === null) {
|
|
|
- obj.surfaceStandard = that.nameObj.ExecutiveStandard.obj[data].surface;
|
|
|
- // }
|
|
|
- } catch (e) {
|
|
|
- obj.chemicalStandard = '';
|
|
|
- console.log('没有对应');
|
|
|
- }
|
|
|
- },
|
|
|
- but_update () {
|
|
|
- let that = this;
|
|
|
- if (that.multipleSelection.length > 0) {
|
|
|
- setTimeout(() => {
|
|
|
- that.$refs['dialog_form3'].clearValidate();
|
|
|
- }, 100);
|
|
|
- that.getLastIssuedData();
|
|
|
- that.dialog.editorBox3.show = true;
|
|
|
- } else {
|
|
|
- this.$message.error('至少要选择一条数据');
|
|
|
- }
|
|
|
- },
|
|
|
- // 轮次描述复制
|
|
|
- but_copy () {
|
|
|
- let that = this;
|
|
|
- that.$refs['dialog_form3'].validate((valid) => {
|
|
|
- if (valid) {
|
|
|
- for (let key in that.rightTableObj) {
|
|
|
- that.rightTableObj[key].describe = that.dialog.editorBox3.form.data.describe;
|
|
|
- }
|
|
|
- that.dialog.editorBox3.show = false;
|
|
|
- }
|
|
|
- });
|
|
|
- },
|
|
|
- // 显示/隐藏
|
|
|
- leftIssueShowChange (val) {
|
|
|
- let that = this;
|
|
|
- if (val) {
|
|
|
- that.leftTableData = that.leftTableDataAll;
|
|
|
- } else {
|
|
|
- that.leftTableData = that.leftTableDataAll.filter(item => item.kxf_weight > 0);
|
|
|
- }
|
|
|
- },
|
|
|
- // 获取最后一次下发的数据
|
|
|
- getLastIssuedData () {
|
|
|
- let that = this;
|
|
|
- let id = 'G-G1';
|
|
|
- if (that.filterForm.data.workprocid === 'AT2006') {
|
|
|
- id = 'G-G2';
|
|
|
- }
|
|
|
- let url = 'pass/ems/v1/emsprodplanrounds/getLastIssuedData/';
|
|
|
+ },
|
|
|
+ getExecutiveStandard () {
|
|
|
+ let that = this;
|
|
|
+ let url = 'pass/ems/v1/emsproductsexecutivestandards/?pageNum=1&pageSize=999';
|
|
|
+ that.axios.get(url)
|
|
|
+ .then(function (res) {
|
|
|
+ if (res.code === '0') {
|
|
|
+ let arr = [];
|
|
|
+ let obj = {};
|
|
|
+ for (let item of res.data.list) {
|
|
|
+ arr.push({
|
|
|
+ brand: item.brand,
|
|
|
+ factory: item.factoryStandard,
|
|
|
+ surface: item.surfaceStandard
|
|
|
+ });
|
|
|
+ obj[item.brand] = {
|
|
|
+ brand: item.brand,
|
|
|
+ factory: item.factoryStandard,
|
|
|
+ surface: item.surfaceStandard
|
|
|
+ };
|
|
|
+ }
|
|
|
+ that.nameObj.ExecutiveStandard.arr = arr;
|
|
|
+ that.nameObj.ExecutiveStandard.obj = obj;
|
|
|
+ } else {
|
|
|
+ that.$message.error(res.message);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
+ gradesChange (data, scope) {
|
|
|
+ let that = this;
|
|
|
+ let obj = that.rightTableObj[scope.row.seq];
|
|
|
+ // 化学成分执行标准 / 出厂执行标准
|
|
|
+ let factory = obj.chemicalStandard;
|
|
|
+ // 表面执行标准
|
|
|
+ let surface = obj.surfaceStandard;
|
|
|
+ // if(factory === '' || factory === null)
|
|
|
+ // {
|
|
|
+ try {
|
|
|
+ obj.chemicalStandard = that.nameObj.ExecutiveStandard.obj[data].factory;
|
|
|
+ if (data === 'Q195' && obj.specifications === '6.5') {
|
|
|
+ obj.chemicalStandard = that.nameObj.ExecutiveStandard.obj['Q195L'].factory;
|
|
|
+ // rightTableObj[xId].chemicalStandard = that.nameObj.ExecutiveStandard.obj['Q195L'].factory;
|
|
|
+ }
|
|
|
+ // }
|
|
|
+ // if(surface === '' || surface === null) {
|
|
|
+ obj.surfaceStandard = that.nameObj.ExecutiveStandard.obj[data].surface;
|
|
|
+ // }
|
|
|
+ } catch (e) {
|
|
|
+ obj.chemicalStandard = '';
|
|
|
+ console.log('没有对应');
|
|
|
+ }
|
|
|
+ },
|
|
|
+ but_update () {
|
|
|
+ let that = this;
|
|
|
+ if (that.multipleSelection.length > 0) {
|
|
|
+ setTimeout(() => {
|
|
|
+ that.$refs['dialog_form3'].clearValidate();
|
|
|
+ }, 100);
|
|
|
+ that.getLastIssuedData();
|
|
|
+ that.dialog.editorBox3.show = true;
|
|
|
+ } else {
|
|
|
+ this.$message.error('至少要选择一条数据');
|
|
|
+ }
|
|
|
+ },
|
|
|
+ // 轮次描述复制
|
|
|
+ but_copy () {
|
|
|
+ let that = this;
|
|
|
+ that.$refs['dialog_form3'].validate((valid) => {
|
|
|
+ if (valid) {
|
|
|
+ for (let key in that.rightTableObj) {
|
|
|
+ that.rightTableObj[key].describe = that.dialog.editorBox3.form.data.describe;
|
|
|
+ }
|
|
|
+ that.dialog.editorBox3.show = false;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
+ // 显示/隐藏
|
|
|
+ leftIssueShowChange (val) {
|
|
|
+ let that = this;
|
|
|
+ if (val) {
|
|
|
+ that.leftTableData = that.leftTableDataAll;
|
|
|
+ } else {
|
|
|
+ that.leftTableData = that.leftTableDataAll.filter(item => item.kxf_weight > 0);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ // 获取最后一次下发的数据
|
|
|
+ getLastIssuedData () {
|
|
|
+ let that = this;
|
|
|
+ let id = 'G-G1';
|
|
|
+ if (that.filterForm.data.workprocid === 'AT2006') {
|
|
|
+ id = 'G-G2';
|
|
|
+ }
|
|
|
+ let url = 'pass/ems/v1/emsprodplanrounds/getLastIssuedData/';
|
|
|
that.axios.get(url, {
|
|
|
params: {
|
|
|
- id: id,
|
|
|
+ id: id,
|
|
|
workprocType: that.filterForm.data.workprocid
|
|
|
}
|
|
|
- })
|
|
|
- .then(function (res) {
|
|
|
- if (res.code === '0') {
|
|
|
- let arr = [];
|
|
|
- let obj = {};
|
|
|
- for (let item of res.data) {
|
|
|
- // console.log('获取当前工序最后一次下发的数据');
|
|
|
- // item.currentDescribe = item.describe.substring(8);
|
|
|
- // item.currentDescribe = item.currentDescribe.replace(/[^0-9]/ig,"");
|
|
|
- arr.push(item);
|
|
|
- obj[id] = item;
|
|
|
- }
|
|
|
- that.lastIssuedData.arr = arr;
|
|
|
- that.lastIssuedData.obj = obj;
|
|
|
- } else {
|
|
|
- that.$message.error(res.message);
|
|
|
- }
|
|
|
- });
|
|
|
+ })
|
|
|
+ .then(function (res) {
|
|
|
+ if (res.code === '0') {
|
|
|
+ let arr = [];
|
|
|
+ let obj = {};
|
|
|
+ for (let item of res.data) {
|
|
|
+ // console.log('获取当前工序最后一次下发的数据');
|
|
|
+ // item.currentDescribe = item.describe.substring(8);
|
|
|
+ // item.currentDescribe = item.currentDescribe.replace(/[^0-9]/ig,"");
|
|
|
+ arr.push(item);
|
|
|
+ obj[id] = item;
|
|
|
+ }
|
|
|
+ that.lastIssuedData.arr = arr;
|
|
|
+ that.lastIssuedData.obj = obj;
|
|
|
+ } else {
|
|
|
+ that.$message.error(res.message);
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -2644,15 +2644,15 @@ function sortNumber (a, b) {
|
|
|
thead .el-table-column--selection .cell {
|
|
|
display: none;
|
|
|
}
|
|
|
- }
|
|
|
- td .el-form-item__error {
|
|
|
- position: static;
|
|
|
- }
|
|
|
- .lastData {
|
|
|
- margin: 0px 0px 10px 5px;
|
|
|
- div {
|
|
|
- margin: 3px;
|
|
|
- }
|
|
|
+ }
|
|
|
+ td .el-form-item__error {
|
|
|
+ position: static;
|
|
|
+ }
|
|
|
+ .lastData {
|
|
|
+ margin: 0px 0px 10px 5px;
|
|
|
+ div {
|
|
|
+ margin: 3px;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
</style>
|
