root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-05-15 09:23:47 +08:00
parent 577c8ee65d
commit a097053f14
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/ViewDialog.vue
View File

@@ -15,11 +15,11 @@
</el-form-item> </el-form-item>
<el-form-item label="所属仓库" prop="stor_name"> <el-form-item label="所属仓库" prop="stor_name">
<label slot="label">所属仓库:</label> <label slot="label">所属仓库:</label>
<el-input v-model="form.stor_name" disabled clearable style="width: 210px" /> <el-input v-model="form.stor_name" disabled clearable style="width: 210px" />
</el-form-item> </el-form-item>
<el-form-item label="入库点" prop="point_code"> <el-form-item label="入库点" prop="point_code">
<label slot="label">入库点:</label> <label slot="label">入库点:</label>
<el-input v-model="form.point_code" disabled clearable style="width: 210px" /> <el-input v-model="form.point_code" disabled clearable style="width: 210px" />
</el-form-item> </el-form-item>
<el-form-item label="生产车间"> <el-form-item label="生产车间">
<el-select <el-select

6
mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/index.vue
View File

@@ -147,7 +147,7 @@
type="warning" type="warning"
icon="el-icon-check" icon="el-icon-check"
size="mini" size="mini"
:disabled= dis_flag :disabled="dis_flag"
@click="confirm" @click="confirm"
> >
强制确认 强制确认
@@ -220,7 +220,7 @@ import ViewDialog from '@/views/wms/storage_manage/semiproduct/semiproductIn/Vie
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
export default { export default {
name: 'semiproductIn', name: 'SemiproductIn',
components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination }, components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination },
cruds() { cruds() {
return CRUD({ return CRUD({
@@ -292,7 +292,7 @@ export default {
buttonChange(currentRow) { buttonChange(currentRow) {
if (currentRow !== null) { if (currentRow !== null) {
this.currentRow = currentRow this.currentRow = currentRow
if (currentRow.bill_status === '10' || currentRow.bill_status === '20' ) { if (currentRow.bill_status === '10' || currentRow.bill_status === '20') {
this.confirm_flag = false this.confirm_flag = false
} else { } else {
this.confirm_flag = true this.confirm_flag = true