kelvin/wms-dj-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
刘名喜 2024-12-16 15:02:09 +08:00
commit 12f75e74ec
6 changed files with 64 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/mes/md/mdItem.js
View File

@ -42,3 +42,11 @@ export function delMdItem(itemId) {
method: 'delete'
})
}
// 同步小型刀具库数据
export function asyncSmallKnifeData() {
return request({
url: '/mes/md/mditem/asyncSmallKnife',
method: 'get'
})
}

4
src/views/login.vue
View File

@ -71,8 +71,8 @@ export default {
return {
codeUrl: "",
loginForm: {
username: "admin",
password: "admin123",
username: "",
password: "",
rememberMe: false,
code: "",
uuid: ""

6
src/views/md/PLAN/index.vue
View File

@ -191,9 +191,9 @@
<!-- 添加或修改出库计划管理对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="60%">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="计划编号" prop="planCode">
<el-input v-model="form.planCode" placeholder="请输入计划编号" :readonly="title == '修改出库计划管理'"/>
</el-form-item>
<!-- <el-form-item label="计划编号" prop="planCode">-->
<!-- <el-input v-model="form.planCode" placeholder="请输入计划编号" :readonly="title == '修改出库计划管理'"/>-->
<!-- </el-form-item>-->
<el-form-item label="出库类型" prop="wmsBusinessTypeId">
<el-select v-model="form.wmsBusinessTypeId" placeholder="请选择出库类型">
<el-option

73
src/views/mes/md/mditem/index.vue
View File

@ -89,6 +89,16 @@
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
@click="asyncSmallKnifeData"
>同步小型刀具库
</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="info"-->
@ -210,15 +220,15 @@
<el-input v-model="form.itemCode" placeholder="请输入物料编码" maxlength="64" v-else/>
</el-form-item>
</el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item label-width="80">-->
<!-- <el-switch v-model="autoGenFlag"-->
<!-- active-color="#13ce66"-->
<!-- active-text="自动生成"-->
<!-- @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">-->
<!-- </el-switch>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label-width="80">-->
<!-- <el-switch v-model="autoGenFlag"-->
<!-- active-color="#13ce66"-->
<!-- active-text="自动生成"-->
<!-- @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">-->
<!-- </el-switch>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="24">
@ -247,15 +257,15 @@
</el-col>
</el-row>
</el-col>
<!-- <el-col :span="10">-->
<!-- <div class="flex-container">-->
<!-- <el-image class="barcodeClass" fit="scale-down" :src="form.barcodeUrl">-->
<!-- <div slot="error" class="image-slot">-->
<!-- <i class="el-icon-picture-outline"></i>-->
<!-- </div>-->
<!-- </el-image>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="10">-->
<!-- <div class="flex-container">-->
<!-- <el-image class="barcodeClass" fit="scale-down" :src="form.barcodeUrl">-->
<!-- <div slot="error" class="image-slot">-->
<!-- <i class="el-icon-picture-outline"></i>-->
<!-- </div>-->
<!-- </el-image>-->
<!-- </div>-->
<!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="12">
@ -291,15 +301,15 @@
</el-col>
</el-row>
<el-row>
<!-- <el-col :span="12">-->
<!-- <el-form-item label="标准数量" prop="standardNumber">-->
<!-- <el-input-number v-model="form.standardNumber" :min="0" :percision="0" :step="1" disabled-->
<!-- v-if="optType=='view'"/>-->
<!-- <el-input-number v-model="form.standardNumber" :min="0" :percision="0" :step="1"-->
<!-- placeholder="请输入标准数量"-->
<!-- v-else/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="标准数量" prop="standardNumber">-->
<!-- <el-input-number v-model="form.standardNumber" :min="0" :percision="0" :step="1" disabled-->
<!-- v-if="optType=='view'"/>-->
<!-- <el-input-number v-model="form.standardNumber" :min="0" :percision="0" :step="1"-->
<!-- placeholder="请输入标准数量"-->
<!-- v-else/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12" v-if="resentEnable">
<el-form-item label="刀刃数" prop="attr1">
<el-input-number v-model="form.attr1" :min="1" :percision="0" :step="1" disabled
@ -453,7 +463,7 @@
</template>
<script>
import {addMdItem, delMdItem, getMdItem, listMdItem, updateMdItem} from "@/api/mes/md/mdItem";
import {addMdItem, asyncSmallKnifeData, delMdItem, getMdItem, listMdItem, updateMdItem} from "@/api/mes/md/mdItem";
import ItemBom from "./components/itembom.vue";
import SOPTab from "./components/sop.vue"
@ -717,6 +727,13 @@ export default {
this.getBarcodeUrl();
});
},
asyncSmallKnifeData() {
asyncSmallKnifeData().then(res => {
console.log(res);
this.$message.success(`同步成功，新增数据 ${res.data} 条`);
this.getList();
})
},
/** 提交按钮 */
submitForm: function () {
this.$refs["form"].validate(valid => {

6
src/views/mes/wm/inPlan/wmsInPlanDetailEntityTableCmps.vue
View File

@ -14,6 +14,10 @@ export default {
planTypeId: {
type: String,
require: true
},
planTypeCode: {
type: String,
require: true
}
},
data() {
@ -25,7 +29,7 @@ export default {
},
computed: {
getKnifeType() {
if (this.planTypeId == 9 || this.planTypeId == 15) {
if (["CDHK", "ZDHK"].includes(this.planTypeCode)) {
return "整刀"
} else {
return "刀柄类"

1
src/views/mes/wm/inPlan/wmsInPlanKnifeBackFormCmps.vue
View File

@ -230,6 +230,7 @@ export default {
<wms-in-plan-detail-entity-table-cmps
:entityList.sync="wmsInPlanDetailEntityList"
:planTypeId="localDataForm.planTypeId"
:planTypeCode="localDataForm.planTypeCode"
></wms-in-plan-detail-entity-table-cmps>
</el-form>
<div slot="footer" class="dialog-footer">