|
|
@@ -3,30 +3,34 @@
|
|
|
<div class="main-app-form">
|
|
|
<!-- 顶部导航栏 -->
|
|
|
<dk-app-nav-bar :title="$t('appProdCodeChange')" @click-left="onClickLeft"></dk-app-nav-bar>
|
|
|
+ <!-- 成型线编码 -->
|
|
|
+ <dk-app-field v-model="formData.moldLineCode" :label="$t('appMoldingCode')" ref="moldLineCode" placeholderType="scan"
|
|
|
+ @changeBarCode="onSearch" />
|
|
|
+ <!-- 成型日期-->
|
|
|
+ <dk-app-field v-model="formData.formingDate" :label="$t('appFormingDate')" :readonly="true" :defaultDateFlag="true"
|
|
|
+ @click="showFormingDateClick" placeholderType="choose" is-link arrow-direction="down" />
|
|
|
+ <!-- 批次 -->
|
|
|
+ <dk-app-field v-model="formData.moldingBatch" :label="$t('appGroutingBatch')" ref="moldingBatch"
|
|
|
+ @changeBarCode="onSearch" />
|
|
|
<!-- 产品条码 -->
|
|
|
- <dk-app-field ref="pdtBarcode" v-model="formData.pdtBarcode" :label="$t('appProductCode')"
|
|
|
- @changeBarCode="scanBarCode(true)" placeholderType="scan" />
|
|
|
-
|
|
|
- <!-- 原产品型号 -->
|
|
|
- <dk-app-field :readonly="true" :label="$t('appOldProdCodeChange')" :placeholderFlag="false"
|
|
|
- v-model="formData.modelName"></dk-app-field>
|
|
|
-
|
|
|
-
|
|
|
+ <dk-app-field ref="productCode" v-model="formData.productCode" :label="$t('appProductCode')" />
|
|
|
<!-- 新产品型号 -->
|
|
|
- <dk-app-field ref="newPdtBarCode" :readonly="newPdtBarCodeFlag" :label="$t('appNewProductBarcode')"
|
|
|
- @changeBarCode="scanNewBarCode" :placeholderTxtFlag="true" :placeholderFlag="false" placeholderType="scan"
|
|
|
- v-model="formData.modelCode" :placeholderTxt="'请扫描' + $t('appProductCode')"></dk-app-field>
|
|
|
-
|
|
|
- <!-- 新型号名称 -->
|
|
|
- <dk-app-field :readonly="true" :label="$t('appNewProdCodeName')" :placeholderFlag="false"
|
|
|
- v-model="formData.newModelName"></dk-app-field>
|
|
|
-
|
|
|
+ <dk-app-field :readonly="true" :label="$t('newModelName')" @click="toChooseBarcode" placeholderType="choose"
|
|
|
+ :isLink="true" clickable v-model="formData.modelName"></dk-app-field>
|
|
|
+ <div class="main-app-table" ref="scrollTable">
|
|
|
+ <!-- 列表-->
|
|
|
+ <dk-app-table :rows="rows" :tableRowData="tableRowData" :checkboxFlag="true" :collapseFlag="false"
|
|
|
+ @onClickCheckbox="onClickCheckbox">
|
|
|
+ </dk-app-table>
|
|
|
+ </div>
|
|
|
<!-- 保存按钮-->
|
|
|
<div class="app_save_bottom-class">
|
|
|
- <dk-app-button :disabled="loading" @click="save">{{ $t('appSave') }}
|
|
|
+ <dk-app-button :disabled="loading" @click="save">{{ $t('appSave') + '(' + tableRowDataLength.length + ')' }}
|
|
|
</dk-app-button>
|
|
|
</div>
|
|
|
-
|
|
|
+ <!-- 单选天日期组件-->
|
|
|
+ <dk-app-dropdown-single-date-day :show="showFormingDateFlag" @onConfirmChooseDate="onConfirmProduceDate"
|
|
|
+ @onCloseChooseDate="onCloseChooseDate"></dk-app-dropdown-single-date-day>
|
|
|
<!-- 加载页面 -->
|
|
|
<dk-app-loading :loading="loading"></dk-app-loading>
|
|
|
</div>
|
|
|
@@ -40,16 +44,72 @@ export default {
|
|
|
mixins: [appFormMixin],
|
|
|
data() {
|
|
|
return {
|
|
|
+ showFormingDateFlag: false,
|
|
|
newPdtBarCodeFlag: true,
|
|
|
formData: {
|
|
|
ftyId: this.$store.state.user.ftyId,//工厂
|
|
|
userId: this.$store.state.user.id,
|
|
|
- pdtBarcode: '' //模具条码
|
|
|
+ pdtBarcode: '',
|
|
|
+ moldLineCode: '',
|
|
|
+ formingDate: '',
|
|
|
+ productCode: '',
|
|
|
+ groupNo: null,
|
|
|
+ moldingBatch: null
|
|
|
},
|
|
|
+ tableRowDataLength: [],
|
|
|
+ tableRowData: [],
|
|
|
+ rows: [
|
|
|
+ { name: 'moldlineCode', title: this.$t('appMoldingCode') }, //成型线编码
|
|
|
+ { name: 'moldlineName', title: this.$t('moldlineName') }, //成型线名称
|
|
|
+ { name: 'moldingBatch', title: this.$t('moldingBatch') }, //成型批次
|
|
|
+ { name: 'productCode', title: this.$t('appProductCode') }, //产品条码
|
|
|
+ { name: 'modelCode', title: this.$t('appProductUniqueCode') }, //产品编码
|
|
|
+ { name: 'groupNo', title: this.$t('groupNo') },
|
|
|
+ { name: 'groupName', title: this.$t('groupName') },
|
|
|
+ { name: 'moldlineItemCode', title: this.$t('appMoldNo') }, //模具编码
|
|
|
+ { name: 'moldlineItemKindName', title: this.$t('moldStatus') }, //模具状态
|
|
|
+ { name: 'itemMoldingUserName', title: this.$t('appMoldingStationNo') },
|
|
|
+ ]
|
|
|
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ /**
|
|
|
+ * @desc : 跳转选择新条码
|
|
|
+ * @author : 于继渤
|
|
|
+ * @date : 2023/2/7 17:23
|
|
|
+ */
|
|
|
+ toChooseBarcode() {
|
|
|
+ this.$router.push({
|
|
|
+ name: 'app-choose-barcode', params: {
|
|
|
+ key: 'app-prod-code-change'
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @desc : 点击复选框
|
|
|
+ * @author : 于继渤
|
|
|
+ * @date : 2023/2/7 17:23
|
|
|
+ */
|
|
|
+ onClickCheckbox(e) {
|
|
|
+ this.tableRowDataLength = this.tableRowData.filter(res => {
|
|
|
+ return res.checked
|
|
|
+ })
|
|
|
+ },
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @desc : 搜索事件
|
|
|
+ * @author : 于继渤
|
|
|
+ * @date : 2023/2/7 17:23
|
|
|
+ */
|
|
|
+ onSearch(e) {
|
|
|
+ this.tableRowData = []
|
|
|
+ //获取数据
|
|
|
+ this.getModelLine()
|
|
|
+ },
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* @desc : 扫码的查询-参数赋值
|
|
|
@@ -58,104 +118,67 @@ export default {
|
|
|
*/
|
|
|
setSearchParams() {
|
|
|
let params = {}
|
|
|
- params.pdtBarcode = this.formData.pdtBarcode;
|
|
|
- params.ftyId = this.$store.state.user.ftyId
|
|
|
- params.userId = this.formData.userId
|
|
|
- params.pageSize = 10
|
|
|
+ params.pageSize = 999
|
|
|
params.currentPage = 1
|
|
|
+ params.ftyId = this.$store.state.user.ftyId
|
|
|
+ params.manageUser = this.formData.userId
|
|
|
params.pdaFlag = '1'
|
|
|
+ params.moldlineCode = this.formData.moldLineCode
|
|
|
return params
|
|
|
},
|
|
|
|
|
|
/**
|
|
|
- * @desc : 扫描原产品条码
|
|
|
+ * @desc : 查询成型线
|
|
|
* @author : 于继渤
|
|
|
- * @date : 2023/3/3 16:21
|
|
|
+ * @date : 2023/2/17 10:34
|
|
|
*/
|
|
|
- scanBarCode(flag) {
|
|
|
- this.loading = true
|
|
|
- // 设置查询条件
|
|
|
+ getModelLine() {
|
|
|
let params = this.setSearchParams();
|
|
|
- // 查询模具信息 -报损和撤销保存的验证
|
|
|
- this.excute(this.$service.commonService, this.$service.commonService.getProductModel, params, '', flag)
|
|
|
- .then(res => {
|
|
|
- if (res.code === this.$config.SUCCESS_CODE) {
|
|
|
- if (res.data.list && res.data.list.length > 0) {
|
|
|
- this.formData = {
|
|
|
- ftyId: this.$store.state.user.ftyId,//工厂
|
|
|
- userId: this.$store.state.user.id,
|
|
|
- pdtBarcode: '' //模具条码
|
|
|
- }
|
|
|
- this.formData.itemId = res.data.list[0].itemId
|
|
|
- this.formData.modelId = res.data.list[0].modelId
|
|
|
- this.formData.modelName = res.data.list[0].modelName
|
|
|
- this.formData.pdtBarcode = res.data.list[0].pdtBarcode
|
|
|
- this.formData.productId = res.data.list[0].productId
|
|
|
-
|
|
|
- this.newPdtBarCodeFlag = false
|
|
|
- this.setFocus('newPdtBarCode')
|
|
|
- } else {
|
|
|
- this.$appDialog.alert({ message: this.$t('W_002', { 'param': this.$t('appBarcode') }) }).then(() => {
|
|
|
- this.formData = {
|
|
|
- ftyId: this.$store.state.user.ftyId,//工厂
|
|
|
- userId: this.$store.state.user.id,
|
|
|
- pdtBarcode: '' //模具条码
|
|
|
- }
|
|
|
- this.setFocus('pdtBarcode')
|
|
|
- });
|
|
|
- }
|
|
|
+ this.excute(this.$service.commonService, this.$service.commonService.getMoldLinePage, params, '', false).then(res => {
|
|
|
+ if (res.code === this.$config.SUCCESS_CODE) {
|
|
|
+ if (res.data.list && res.data.list.length > 0) {
|
|
|
+ let param = {}
|
|
|
+ param.ftyId = this.$store.state.user.ftyId
|
|
|
+ param.moldingDate = this.formData.formingDate
|
|
|
+ param.manageUser = this.formData.userId
|
|
|
+ param.pageSize = 999
|
|
|
+ param.currentPage = 1
|
|
|
+ param.moldingBatch = this.formData.moldingBatch
|
|
|
+ param.groupNo = this.formData.groupNo
|
|
|
+ param.productCode = this.formData.productCode
|
|
|
+ param.pdaFlag = '1'
|
|
|
+ param.moldlineId = res.data.list[0].moldlineId ? res.data.list[0].moldlineId : null
|
|
|
+ this.getData(param)
|
|
|
}
|
|
|
-
|
|
|
- })
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
|
|
|
-
|
|
|
- setSearchNewParams() {
|
|
|
- let params = {}
|
|
|
- params.modelCode = this.formData.modelCode;
|
|
|
- params.ftyId = this.$store.state.user.ftyId
|
|
|
- params.userId = this.formData.userId
|
|
|
- params.pageSize = 10
|
|
|
- params.currentPage = 1
|
|
|
- params.pdaFlag = '1'
|
|
|
- return params
|
|
|
- },
|
|
|
/**
|
|
|
- * @desc : 扫描新产品条码
|
|
|
+ * @desc : 查询数据
|
|
|
* @author : 于继渤
|
|
|
- * @date : 2023/3/3 16:21
|
|
|
+ * @date : 2023/2/17 10:34
|
|
|
*/
|
|
|
- scanNewBarCode() {
|
|
|
- this.loading = true
|
|
|
- // 设置查询条件
|
|
|
- let params = this.setSearchNewParams();
|
|
|
- // 查询模具信息 -报损和撤销保存的验证
|
|
|
- this.excute(this.$service.commonService, this.$service.commonService.getModelProductByPage, params ,'', true)
|
|
|
- .then(res => {
|
|
|
- console.log(res)
|
|
|
- if (res.code === this.$config.SUCCESS_CODE) {
|
|
|
- if (res.data.list && res.data.list.length > 0) {
|
|
|
- this.formData.categoryName = res.data.list[0].categoryName
|
|
|
- this.formData.modelCode = res.data.list[0].modelCode
|
|
|
- this.formData.newModelId = res.data.list[0].modelId
|
|
|
- this.formData.newModelName = res.data.list[0].modelName
|
|
|
- this.formData.repPdtModelName = res.data.list[0].repPdtModelName
|
|
|
- } else {
|
|
|
- this.$appDialog.alert({ message: this.$t('W_002', { 'param': this.$t('appBarcode') }) }).then(() => {
|
|
|
- this.formData.modelCode = ''
|
|
|
- this.formData.categoryName = ''
|
|
|
- this.formData.newModelId = null
|
|
|
- this.formData.newModelName = ''
|
|
|
- this.formData.repPdtModelName = ''
|
|
|
- this.setFocus('newPdtBarCode') //清除焦点内容
|
|
|
- });
|
|
|
- }
|
|
|
- }
|
|
|
+ getData(param) {
|
|
|
+ this.excute(this.$service.moldingRecordService, this.$service.moldingRecordService.selectMoldingGiveCodeChange, param, '', true).then(res => {
|
|
|
+ if (res.code === this.$config.SUCCESS_CODE) {
|
|
|
+ if (res.data.list && res.data.list.length > 0) {
|
|
|
+ res.data.list.forEach(it => {
|
|
|
+ it.checked = false
|
|
|
+ })
|
|
|
+ this.tableRowData = res.data.list
|
|
|
+ } else {
|
|
|
+ this.$appDialog.alert({ message: this.$t('W_002', { 'param': this.$t('appMoldingCode') }) }).then(() => {
|
|
|
+ this.tableRowData = []
|
|
|
+ this.formData.moldLineCode = ''
|
|
|
+ this.setFocus('moldLineCode')
|
|
|
+ });
|
|
|
|
|
|
- })
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* @desc : 保存的校验
|
|
|
* @author : 于继渤
|
|
|
@@ -163,32 +186,45 @@ export default {
|
|
|
*/
|
|
|
validData() {
|
|
|
//产品条码输入
|
|
|
- if (!this.formData.pdtBarcode) {
|
|
|
- this.appToastFail(this.$t('inputWords', { 'search-name': this.$t('appProductCodeB') }));
|
|
|
- return false;
|
|
|
- }
|
|
|
- //产品条码验证
|
|
|
if (!this.formData.modelName) {
|
|
|
- this.appToastFail(this.$t('appCheckBarcodeIsCheck'));
|
|
|
+ this.appToastFail(this.$t('selectWords', { 'search-name': this.$t('newModelName') }));
|
|
|
return false;
|
|
|
}
|
|
|
-
|
|
|
- //新产品条码输入
|
|
|
- if (!this.formData.modelCode) {
|
|
|
- this.appToastFail(this.$t('inputWords', { 'search-name': this.$t('appNewProductBarcode') }));
|
|
|
- return false;
|
|
|
- }
|
|
|
- //新产品条码验证
|
|
|
- if (!this.formData.newModelName) {
|
|
|
- this.appToastFail(this.$t('appNewCheckBarcodeIsCheck'));
|
|
|
+ if (this.tableRowDataLength.length === 0) {
|
|
|
+ this.appToastFail(this.$t('W_013'));
|
|
|
return false;
|
|
|
}
|
|
|
-
|
|
|
return true
|
|
|
},
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
+ * @desc : 日期打开事件
|
|
|
+ * @author : 于继渤
|
|
|
+ * @date : 2023/2/14 9:35
|
|
|
+ */
|
|
|
+ showFormingDateClick() {
|
|
|
+ this.showFormingDateFlag = true;
|
|
|
+ },
|
|
|
|
|
|
+ /**
|
|
|
+ * @desc : 成型日期确定事件
|
|
|
+ * @author : 于继渤
|
|
|
+ * @date : 2023/2/13 13:39
|
|
|
+ */
|
|
|
+ onConfirmProduceDate(e) {
|
|
|
+ this.formData.formingDate = e.date;
|
|
|
+ this.showFormingDateFlag = false;
|
|
|
+ },
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @desc : 成型日期关闭事件
|
|
|
+ * @author : 于继渤
|
|
|
+ * @date : 2023/2/13 14:28
|
|
|
+ */
|
|
|
+ onCloseChooseDate() {
|
|
|
+ this.showFormingDateFlag = false;
|
|
|
+ },
|
|
|
|
|
|
|
|
|
// region 保存
|
|
|
@@ -199,11 +235,16 @@ export default {
|
|
|
*/
|
|
|
setParams() {
|
|
|
this.params.ftyId = this.formData.ftyId
|
|
|
- this.params.itemId = this.formData.itemId
|
|
|
- this.params.oldModelName = this.formData.modelName
|
|
|
- this.params.pdtBarcode = this.formData.pdtBarcode
|
|
|
- this.params.pdtModelId = this.formData.newModelId
|
|
|
- this.params.productId = this.formData.productId
|
|
|
+ this.params.pdtModelId = this.formData.modelId
|
|
|
+ this.params.pdtUniqueId = this.formData.pdtUniqueId
|
|
|
+ let listTemp = []
|
|
|
+ this.tableRowDataLength.forEach(res => {
|
|
|
+ listTemp.push({
|
|
|
+ productId: res.pdtUniqueId,
|
|
|
+ itemId: res.moldingItemId
|
|
|
+ })
|
|
|
+ })
|
|
|
+ this.params.list = listTemp
|
|
|
},
|
|
|
|
|
|
/**
|
|
|
@@ -214,7 +255,6 @@ export default {
|
|
|
saveData() {
|
|
|
//保存
|
|
|
return this.excute(this.$service.prodCodeChangeService, this.$service.prodCodeChangeService.updateProductModel, this.params, '', true)
|
|
|
-
|
|
|
},
|
|
|
|
|
|
/**
|
|
|
@@ -223,14 +263,25 @@ export default {
|
|
|
* @date : 2023/2/10 15:50
|
|
|
*/
|
|
|
clear() {
|
|
|
+ this.formData = {
|
|
|
+ ftyId: this.$store.state.user.ftyId,//工厂
|
|
|
+ userId: this.$store.state.user.id,
|
|
|
+ pdtBarcode: '',
|
|
|
+ moldLineCode: '',
|
|
|
+ formingDate: '',
|
|
|
+ productCode: '',
|
|
|
+ groupNo: null,
|
|
|
+ moldingBatch: null
|
|
|
+ }
|
|
|
//重新查询当前数据
|
|
|
- this.scanBarCode(false)
|
|
|
+ this.getData(false)
|
|
|
},
|
|
|
|
|
|
// endregion
|
|
|
},
|
|
|
mounted() {
|
|
|
- this.setFocus('pdtBarcode')
|
|
|
+ this.setFocus('moldLineCode')
|
|
|
+ this.setAppTableHeight()
|
|
|
},
|
|
|
/**
|
|
|
* 初始生命周期
|
|
|
@@ -238,7 +289,18 @@ export default {
|
|
|
*/
|
|
|
created(e) {
|
|
|
|
|
|
- }
|
|
|
+ },
|
|
|
+ activated() {
|
|
|
+ if (localStorage.getItem("app-choose-barcode-chooseData") !== null) {
|
|
|
+ let chooseData = JSON.parse(localStorage.getItem("app-choose-barcode-chooseData")) || []
|
|
|
+ this.$set(this.formData, 'modelName', chooseData.modelName)
|
|
|
+ this.$set(this.formData, 'modelId', chooseData.modelId)
|
|
|
+ this.$set(this.formData, 'categoryName', chooseData.categoryName)
|
|
|
+ this.$set(this.formData, 'modelCode', chooseData.modelCode)
|
|
|
+ this.$set(this.formData, 'repPdtModelName', chooseData.repPdtModelName)
|
|
|
+ localStorage.removeItem("app-choose-barcode-chooseData")
|
|
|
+ }
|
|
|
+ },
|
|
|
}
|
|
|
</script>
|
|
|
|
