| src/components/DragSelect/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/basicSettings/storageList.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/basicSettings/warehouseList.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/mouldManager/mouldList.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/produce/stepReport.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/systemSetting/dataImport.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/workOrder/workOrderList.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/components/DragSelect/index.vue
@@ -1,5 +1,5 @@ <template> <el-select ref="dragSelect" v-model="selectVal" v-bind="$attrs" class="drag-select" multiple v-on="$listeners"> <el-select ref="dragSelect" v-model="selectVal" v-bind="$attrs" class="drag-select" multiple filterable v-on="$listeners"> <slot /> </el-select> </template> src/views/basicSettings/storageList.vue
@@ -63,13 +63,13 @@ > <div class="bodyTopButtonGroup" style="justify-content: space-between"> <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button> <!-- <el-button--> <!-- v-waves--> <!-- type="success"--> <!-- icon="el-icon-download"--> <!-- @click="$router.push('./../systemSetting/dataImport?fileCode=7')"--> <!-- >导入--> <!-- </el-button>--> <el-button v-waves type="success" icon="el-icon-download" @click="$router.push('./../systemSetting/dataImport?fileCode=7')" >导入 </el-button> </div> <div class="bodyTopFormGroup"> src/views/basicSettings/warehouseList.vue
@@ -5,13 +5,13 @@ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button> <div style="display:flex"> <!-- <el-button--> <!-- v-waves--> <!-- type="success"--> <!-- icon="el-icon-download"--> <!-- @click="$router.push('./../systemSetting/dataImport?fileCode=6')"--> <!-- >导入--> <!-- </el-button>--> <el-button v-waves type="success" icon="el-icon-download" @click="$router.push('./../systemSetting/dataImport?fileCode=6')" >导入 </el-button> <el-button v-waves icon="el-icon-refresh-right" @click="syncERP">同步仓库</el-button> </div> </div> src/views/mouldManager/mouldList.vue
@@ -310,22 +310,41 @@ </el-radio-group> </el-form-item> <!-- <el-form-item label="仓库信息" prop="warehousecode">--> <!-- <el-select--> <!-- v-model="dialogForm.warehousecode"--> <!-- style="width:200px"--> <!-- placeholder="请选择"--> <!-- filterable--> <!-- :popper-append-to-body="false"--> <!-- >--> <!-- <el-option--> <!-- v-for="item in wareHouseArr"--> <!-- :key="item.code"--> <!-- :label="item.name"--> <!-- :value="item.code"--> <!-- />--> <!-- </el-select>--> <!-- </el-form-item>--> <el-form-item v-if="dialogForm.opertype==='Add'" prop="warehousecode" label="所属仓库"> <el-select v-model="dialogForm.warehousecode" style="width:200px" placeholder="请选择" filterable :popper-append-to-body="false" @change="warehousecodeChange" > <el-option v-for="item in wareHouseArr" :key="item.code" :label="item.name" :value="item.code" /> </el-select> </el-form-item> <el-form-item v-if="dialogForm.opertype==='Add'" prop="location_code" label="所属库位"> <el-select v-model="dialogForm.location_code" style="width:200px" :disabled="dialogForm.warehousecode===''" placeholder="请选择" filterable :popper-append-to-body="false" > <el-option v-for="item in locationArr" :key="item.code" :label="item.name" :value="item.code" /> </el-select> </el-form-item> <el-form-item label="预计寿命(次)"> <el-input v-model="dialogForm.surplife" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" /> @@ -524,7 +543,7 @@ ProductionScheduleReportSearch } from '@/api/ReportManager' import { AddUpdateMouldManger, DeleteMouldManger, MoldResumeSearch, MouldMangerSearch } from '@/api/MouldManager' import { InventoryTreePermissions, WareHouse } from '@/api/GeneralBasicData' import { InventoryTreePermissions, WareHouse, WareHouseSelectLocation } from '@/api/GeneralBasicData' import arrayToTree from 'array-to-tree' import { TCunstomerDelete } from '@/api/basicSettings' @@ -580,7 +599,8 @@ mouldcode: '', mouldname: '', mouldspec: '', // warehousecode: '', warehousecode: '', // 仓库编码 location_code: '', // 库位编码 surplife: '', resilife: '', status: 'Y', @@ -593,10 +613,13 @@ ], mouldname: [ { required: true, message: '请输入模具名称', trigger: ['blur', 'change'] } ], warehousecode: [ { required: true, message: '请输入选择仓库信息', trigger: ['blur', 'change'] } ], location_code: [ { required: true, message: '请输入选择库位信息', trigger: ['blur', 'change'] } ] // warehousecode: [ // { required: true, message: '请输入选择仓库信息', trigger: ['blur', 'change'] } // ] }, filterText: '', defaultProps: { @@ -610,7 +633,8 @@ // } ], wareHouseArr: [], wareHouseArr: [], // 仓库数组 locationArr: [], // 库位数组 dialogVisibleResume: false, formResume: { @@ -730,7 +754,10 @@ this.form.createdate = '' this.getMouldMangerSearch() }, async warehousecodeChange(val) { const { data: res } = await WareHouseSelectLocation({ warhousecode: val }) this.locationArr = res }, add() { this.operation = 'add' this.dialogForm.opertype = 'Add' @@ -745,7 +772,8 @@ this.dialogForm.mouldcode = row.code this.dialogForm.mouldname = row.name this.dialogForm.mouldspec = row.spec // this.dialogForm.warehousecode = row.warehousecode this.dialogForm.warehousecode = row.warehousecode this.dialogForm.location_code = row.location_code this.dialogForm.surplife = row.surp_life this.dialogForm.resilife = row.resi_life this.dialogForm.status = row.status @@ -831,7 +859,8 @@ mouldcode: '', mouldname: '', mouldspec: '', // warehousecode: '', warehousecode: '', location_code: '', surplife: '', resilife: '', status: 'Y', src/views/produce/stepReport.vue
@@ -385,12 +385,13 @@ <div class="dialogFormItemDiv" style="color:red;">{{ dialogForm.noputqty }}</div> </el-form-item> <el-form-item v-if="activeName==='生产列表'" prop="eqpcode" label="报工设备" class="dialogFormItem"> <el-form-item v-if="activeName==='生产列表'" label="报工设备" class="dialogFormItem"> <el-select v-model="dialogForm.eqpcode" style="width:200px" placeholder="请选择" filterable clearable :popper-append-to-body="false" > <el-option src/views/systemSetting/dataImport.vue
@@ -144,7 +144,10 @@ item.indexOf('保养部位要求')!==-1|| item.indexOf('保养项目要求')!==-1|| item.indexOf('点检部位要求')!==-1|| item.indexOf('点检项目要求')!==-1 item.indexOf('点检项目要求')!==-1|| item.indexOf('仓库编码')!==-1|| item.indexOf('库位编码')!==-1 " > <el-input v-model="row[item]" placeholder="请输入" /> @@ -545,6 +548,17 @@ this.tableData[0].forEach(j => { j['*状态'] = j['*状态'] ? this.statusArr.find(e => e.name === j['*状态']).code : '' j['*库位管理'] = j['*库位管理'] ? this.isYesOrNo.find(e => e.name === j['*库位管理']).code : '' j.uuid = nanoid() }) } if (this.sheetName.indexOf('库位设置') !== -1) { this.statusArr = [ { code: '0', name: '正常' }, { code: '1', name: '停用' } ] this.tableData[0].forEach(j => { j['*状态'] = j['*状态'] ? this.statusArr.find(e => e.name === j['*状态']).code : '' j.uuid = nanoid() }) } @@ -1413,6 +1427,14 @@ flag = false msg = '*状态不能为空！' } if (!j['*仓库编码']) { flag = false msg = '*仓库编码不能为空！' } if (!j['*库位编码']) { flag = false msg = '*库位编码不能为空！' } }) this.tableData[1].forEach(j => { if (!j['模具编码'] && j['产品编码']) { @@ -1981,8 +2003,11 @@ '*模具名称': '', '规格型号': '', '*状态': 'Y', '*仓库编码': '', '*库位编码': '', '预计寿命(次)': '', '剩余寿命(次)': '' }) } if (this.sheetName.indexOf('模具关联产品') !== -1 && this.activeName === '1') { src/views/workOrder/workOrderList.vue
@@ -2425,6 +2425,10 @@ }, // 派发 send() { if (this.multipleSelection.length === 0) { return this.$message.info('请先勾选相对应的工单！') } this.$confirm('是否确认派发?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消',
