diff --git a/lms/nladmin-ui/src/views/wms/hw/detail/index.vue b/lms/nladmin-ui/src/views/wms/hw/detail/index.vue
index ed3c2ec..29cadf6 100644
--- a/lms/nladmin-ui/src/views/wms/hw/detail/index.vue
+++ b/lms/nladmin-ui/src/views/wms/hw/detail/index.vue
@@ -99,8 +99,7 @@
:max="10000"
:step="10"
size="mini"
- >
- </el-input-number>
+ />
</el-form-item>
<rrOperation />
</el-form>
@@ -108,7 +107,7 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表格渲染-->
- <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler" height="300">
+ <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" height="300" @selection-change="crud.selectionChangeHandler">
<el-table-column v-permission="[]" label="操作" width="80px" align="center" fixed="right">
<template slot-scope="scope">
<el-button
@@ -137,26 +136,26 @@
</el-table-column>
</el-table>
<el-dialog
- :visible.sync="dialogVisible"
- title="选择点位"
- >
- <el-form ref="form" :model="form">
- <el-form-item label="点位列表">
- <el-select v-model="form.selectedPoint" placeholder="请选择点位">
- <el-option
+ :visible.sync="dialogVisible"
+ title="选择点位"
+ >
+ <el-form ref="form" :model="form">
+ <el-form-item label="点位列表">
+ <el-select v-model="form.selectedPoint" placeholder="请选择点位">
+ <el-option
v-for="item in points"
:key="item.point_code"
:label="item.point_code"
:value="item.point_code"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button @click="dialogVisible = false">取消</el-button>
- <el-button type="primary" @click="submitSelectedPoint">确认</el-button>
- </div>
- </el-dialog>
+ />
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="dialogVisible = false">取消</el-button>
+ <el-button type="primary" @click="submitSelectedPoint">确认</el-button>
+ </div>
+ </el-dialog>
<!--分页组件-->
<pagination />
</div>
@@ -228,7 +227,7 @@ export default {
return true
},
getPointList() { // 获取点位列表
- crudSchBasePoint.getPointsByRegionCodes("HW").then(res => {
+ crudSchBasePoint.getPointsByRegionCodes('HW').then(res => {
this.pointList = res
})
},
@@ -248,32 +247,31 @@ export default {
})
},
handleButtonClick(row) {
- this.selectedRow = row;
- this.dialogVisible = true;
- this.fetchPoints();
+ this.selectedRow = row
+ this.dialogVisible = true
+ this.fetchPoints()
},
fetchPoints() {
crudSchBasePoint.getCBPointList().then(res => {
- this.points = res;
+ this.points = res
})
-
},
submitSelectedPoint() {
- const selectedPoint = this.form.selectedPoint;
+ const selectedPoint = this.form.selectedPoint
if (!selectedPoint) {
- this.$message.warning('请选择一个点位');
- return;
+ this.$message.warning('请选择一个点位')
+ return
}
// Submit the selected point to the backend
this.$axios.post('/api/pda/task', {
start_point: this.selectedRow.pointCode,
next_point: selectedPoint
}).then(response => {
- this.$message.success('提交成功');
- this.dialogVisible = false;
+ this.$message.success('提交成功')
+ this.dialogVisible = false
}).catch(error => {
- this.$message.error('提交失败');
- });
+ this.$message.error('提交失败')
+ })
}
}
}
diff --git a/lms/nladmin-ui/src/views/wms/hw/in/index.vue b/lms/nladmin-ui/src/views/wms/hw/in/index.vue
index 10ffd8d..b2e0837 100644
--- a/lms/nladmin-ui/src/views/wms/hw/in/index.vue
+++ b/lms/nladmin-ui/src/views/wms/hw/in/index.vue
@@ -99,8 +99,7 @@
:max="10000"
:step="10"
size="mini"
- >
- </el-input-number>
+ />
</el-form-item>
<rrOperation />
</el-form>
@@ -136,7 +135,6 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
-
export default {
name: 'HwIn',
components: { pagination, crudOperation, rrOperation, udOperation },
@@ -184,7 +182,7 @@ export default {
return true
},
getPointList() { // 获取点位列表
- crudSchBasePoint.getPointsByRegionCodes("YL,YLHC,KJHC").then(res => {
+ crudSchBasePoint.getPointsByRegionCodes('YL,YLHC,KJHC').then(res => {
this.pointList = res
})
},
diff --git a/lms/nladmin-ui/src/views/wms/hw/inpending/index.vue b/lms/nladmin-ui/src/views/wms/hw/inpending/index.vue
index 48962da..94aa4b1 100644
--- a/lms/nladmin-ui/src/views/wms/hw/inpending/index.vue
+++ b/lms/nladmin-ui/src/views/wms/hw/inpending/index.vue
@@ -99,8 +99,7 @@
:max="10000"
:step="10"
size="mini"
- >
- </el-input-number>
+ />
</el-form-item>
<rrOperation />
</el-form>
@@ -181,7 +180,7 @@ export default {
return true
},
getPointList() { // 获取点位列表
- crudSchBasePoint.getPointsByRegionCodes("YL,YLHC,KJHC").then(res => {
+ crudSchBasePoint.getPointsByRegionCodes('YL,YLHC,KJHC').then(res => {
this.pointList = res
})
},
diff --git a/lms/nladmin-ui/src/views/wms/hw/out/index.vue b/lms/nladmin-ui/src/views/wms/hw/out/index.vue
index 84ef5bf..32af453 100644
--- a/lms/nladmin-ui/src/views/wms/hw/out/index.vue
+++ b/lms/nladmin-ui/src/views/wms/hw/out/index.vue
@@ -87,20 +87,19 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="每托根数">
- <el-input-number
- v-model="query.number"
- filterable
- laceholder="每托根数"
- clearable
- controls-position="right"
- :min="0"
- :max="10000"
- :step="10"
- size="mini"
- >
- </el-input-number>
- </el-form-item>
+ <el-form-item label="每托根数">
+ <el-input-number
+ v-model="query.number"
+ filterable
+ laceholder="每托根数"
+ clearable
+ controls-position="right"
+ :min="0"
+ :max="10000"
+ :step="10"
+ size="mini"
+ />
+ </el-form-item>
<rrOperation />
</el-form>
</div>
@@ -191,7 +190,7 @@ export default {
return true
},
getPointList() { // 获取点位列表
- crudSchBasePoint.getPointsByRegionCodes("HW").then(res => {
+ crudSchBasePoint.getPointsByRegionCodes('HW').then(res => {
this.pointList = res
})
},
diff --git a/lms/nladmin-ui/src/views/wms/hw/outpending/index.vue b/lms/nladmin-ui/src/views/wms/hw/outpending/index.vue
index ce8b488..3d35214 100644
--- a/lms/nladmin-ui/src/views/wms/hw/outpending/index.vue
+++ b/lms/nladmin-ui/src/views/wms/hw/outpending/index.vue
@@ -99,8 +99,7 @@
:max="10000"
:step="10"
size="mini"
- >
- </el-input-number>
+ />
</el-form-item>
<rrOperation />
</el-form>
@@ -182,7 +181,7 @@ export default {
return true
},
getPointList() { // 获取点位列表
- crudSchBasePoint.getPointsByRegionCodes("HW").then(res => {
+ crudSchBasePoint.getPointsByRegionCodes('HW').then(res => {
this.pointList = res
})
},
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/PointDetailDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/PointDetailDialog.vue
index 15c926c..3d947c0 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/PointDetailDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/PointDetailDialog.vue
@@ -1,134 +1,135 @@
<template>
- <el-dialog
- title="物料选择"
- append-to-body
- :visible.sync="dialogVisible"
- destroy-on-close
- width="1000px"
- @close="close"
- @open="open"
+ <el-dialog
+ title="物料选择"
+ append-to-body
+ :visible.sync="dialogVisible"
+ destroy-on-close
+ width="1000px"
+ @close="close"
+ @open="open"
+ >
+ <el-form
+ :inline="true"
+ class="demo-form-inline"
+ label-position="right"
+ label-width="80px"
+ label-suffix=":"
>
- <el-form
- :inline="true"
- class="demo-form-inline"
- label-position="right"
- label-width="80px"
- label-suffix=":"
- >
- <el-form-item label="物料编码">
- <el-input
- v-model="query.productname"
- clearable
- size="mini"
- placeholder="物料编码"
- :disabled="true"
- @keyup.enter.native="crud.toQuery"
- />
- </el-form-item>
- <rrOperation />
- </el-form>
+ <el-form-item label="物料编码">
+ <el-input
+ v-model="query.productname"
+ clearable
+ size="mini"
+ placeholder="物料编码"
+ :disabled="true"
+ @keyup.enter.native="crud.toQuery"
+ />
+ </el-form-item>
+ <rrOperation />
+ </el-form>
- <!--表格渲染-->
- <el-table
- ref="table"
- v-loading="crud.loading"
- :data="crud.data"
- style="width: 100%;"
- size="mini"
- border
- :cell-style="{'text-align':'center'}"
- :header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
- @selection-change="crud.selectionChangeHandler"
- >
- <el-table-column type="selection" width="55" />
- <el-table-column prop="point_code" label="所在点位" width="120px" />
- <el-table-column prop="productName" label="物料编码" />
- <el-table-column prop="palletSN" label="子托盘号" min-width="120" show-overflow-tooltip />
- <el-table-column prop="qty" label="数量" width="100" show-overflow-tooltip />
- </el-table>
- <!--分页组件-->
- <pagination />
- <el-button
+ <!--表格渲染-->
+ <el-table
+ ref="table"
+ v-loading="crud.loading"
+ :data="crud.data"
+ style="width: 100%;"
+ size="mini"
+ border
+ :cell-style="{'text-align':'center'}"
+ :header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
+ @selection-change="crud.selectionChangeHandler"
+ >
+ <el-table-column type="selection" width="55" />
+ <el-table-column prop="point_code" label="所在点位" width="120px" />
+ <el-table-column prop="productName" label="物料编码" />
+ <el-table-column prop="palletSN" label="子托盘号" min-width="120" show-overflow-tooltip />
+ <el-table-column prop="qty" label="数量" width="100" show-overflow-tooltip />
+ </el-table>
+ <!--分页组件-->
+ <pagination />
+ <el-button
type="primary"
- @click="submitSelectedRows">
+ @click="submitSelectedRows"
+ >
原材料出库
</el-button>
- </el-dialog>
- </template>
+ </el-dialog>
+</template>
- <script>
+<script>
- import CRUD, { header, presenter } from '@crud/crud'
- import rrOperation from '@crud/RR.operation'
- import pagination from '@crud/Pagination'
- import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
- export default {
- name: 'WorkOrderDetailDialog',
- components: { rrOperation, pagination },
- dicts: ['is_used', 'vehicle_type'],
- cruds() {
- return CRUD({ title: '点位详情', url: 'api/pointDetail', optShow: {}})
+export default {
+ name: 'WorkOrderDetailDialog',
+ components: { rrOperation, pagination },
+ dicts: ['is_used', 'vehicle_type'],
+ cruds() {
+ return CRUD({ title: '点位详情', url: 'api/pointDetail', optShow: {}})
+ },
+ mixins: [presenter(), header()],
+ props: {
+ dialogShow: {
+ type: Boolean,
+ default: false
},
- mixins: [presenter(), header()],
- props: {
- dialogShow: {
- type: Boolean,
- default: false
- },
- productname: {
+ productname: {
type: String,
default: ''
- },workorder_code: {
+ }, workorderCode: {
type: String,
default: ''
}
- },
- data() {
- return {
- dialogVisible: false,
- tableRadio: null,
- tableData: []
+ },
+ data() {
+ return {
+ dialogVisible: false,
+ tableRadio: null,
+ tableData: []
+ }
+ },
+ watch: {
+ dialogShow: {
+ handler(newValue) {
+ this.dialogVisible = newValue
}
},
- watch: {
- dialogShow: {
- handler(newValue) {
- this.dialogVisible = newValue
- }
- },
- productname(newVal) {
+ productname(newVal) {
// 监听传递的值变化，并在变化时执行赋值操作
- this.query.productname = newVal;
- this.executeQuery();
+ this.query.productname = newVal
+ this.executeQuery()
},
workorder_code(newVal) {
// 监听传递的值变化，并在变化时执行赋值操作
- this.workorder_code = newVal;
+ this.workorder_code = newVal
}
+ },
+ methods: {
+ open() {
},
- methods: {
- open() {
- },
- close() {
- this.crud.resetQuery(false)
- this.$emit('update:dialogShow', false)
- },
- executeQuery() {
- this.crud.toQuery();
- },
- submitSelectedRows() {
- const selectedRows = this.$refs.table.selection;
+ close() {
+ this.crud.resetQuery(false)
+ this.$emit('update:dialogShow', false)
+ },
+ executeQuery() {
+ this.crud.toQuery()
+ },
+ submitSelectedRows() {
+ const selectedRows = this.$refs.table.selection
if (selectedRows.length === 0) {
- this.$message.error('请至少选择一行数据');
- return;
+ this.$message.error('请至少选择一行数据')
+ return
}
// 获取选中行的 point_code
- const pointCodes = selectedRows.map(row => row.point_code);
+ const pointCodes = selectedRows.map(row => row.point_code)
- // 弹出输入回温时间和回温模式的对话框
- this.$prompt('请输入回温时间', '提示', {
+ // 弹出输入回温时间和回温模式的对话框
+ this.$prompt('请输入回温时间', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPattern: /\d+/,
@@ -146,32 +147,32 @@
workorder_code: this.workorder_code // 使用workorder_code属性
}).then(response => {
// 提交成功处理
- this.$message.success('提交成功！');
+ this.$message.success('提交成功！')
// 关闭当前对话框
- this.dialogVisible = false;
+ this.dialogVisible = false
}).catch(error => {
// 提交失败处理
- this.$message.error('提交失败，请重试');
- });
+ this.$message.error('提交失败，请重试')
+ })
}).catch(() => {
// 用户点击了取消按钮
this.$message({
type: 'info',
message: '已取消提交操作'
- });
- });
+ })
+ })
}).catch(() => {
// 用户点击了取消按钮
this.$message({
type: 'info',
message: '已取消提交操作'
- });
- });
+ })
+ })
}
}
- }
- </script>
+}
+</script>
<style rel="stylesheet/scss" lang="scss" scoped>
::v-deep .el-dialog__body {
padding-top: 0px;
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/WorkOrderDetailDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/WorkOrderDetailDialog.vue
index 4910523..328e6f9 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/WorkOrderDetailDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/WorkOrderDetailDialog.vue
@@ -42,7 +42,7 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="workorder_code" label="工单编号" width="120px" />
- <el-table-column prop="matnr" label="物料编码" />
+ <el-table-column prop="matnr" label="物料编码" />
<el-table-column prop="maktx" label="物料名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="mtype" label="产品类别" width="100" show-overflow-tooltip />
<el-table-column prop="mtytxt" label="产品类别描述" width="100" show-overflow-tooltip />
@@ -62,74 +62,74 @@
<pagination />
</el-dialog>
<PointDetailDialog :dialog-show.sync="pointDetailDialog" :workorder_code="workorder_code" :productname="productname" />
-</div>
- </template>
+ </div>
+</template>
- <script>
+<script>
- import CRUD, { header, presenter } from '@crud/crud'
- import rrOperation from '@crud/RR.operation'
- import pagination from '@crud/Pagination'
- import '@riophae/vue-treeselect/dist/vue-treeselect.css'
- import PointDetailDialog from '@/views/wms/pdm/workerorder/PointDetailDialog.vue'
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import PointDetailDialog from '@/views/wms/pdm/workerorder/PointDetailDialog.vue'
- export default {
- name: 'WorkOrderDetailDialog',
- components: { PointDetailDialog,rrOperation, pagination },
- dicts: ['is_used', 'vehicle_type'],
- cruds() {
- return CRUD({ title: '生产工单', url: 'api/pdmBdWorkorderDetail', optShow: {}})
+export default {
+ name: 'WorkOrderDetailDialog',
+ components: { PointDetailDialog, rrOperation, pagination },
+ dicts: ['is_used', 'vehicle_type'],
+ cruds() {
+ return CRUD({ title: '生产工单', url: 'api/pdmBdWorkorderDetail', optShow: {}})
+ },
+ mixins: [presenter(), header()],
+ props: {
+ dialogShow: {
+ type: Boolean,
+ default: false
},
- mixins: [presenter(), header()],
- props: {
- dialogShow: {
- type: Boolean,
- default: false
- },
- message: {
+ message: {
type: String,
default: ''
}
- },
- data() {
- return {
- dialogVisible: false,
- pointDetailDialog:false,
- productname: null,
- workorder_code: null
+ },
+ data() {
+ return {
+ dialogVisible: false,
+ pointDetailDialog: false,
+ productname: null,
+ workorder_code: null
+ }
+ },
+ watch: {
+ dialogShow: {
+ handler(newValue) {
+ this.dialogVisible = newValue
}
},
- watch: {
- dialogShow: {
- handler(newValue) {
- this.dialogVisible = newValue
- }
- },
- message(newVal) {
+ message(newVal) {
// 监听传递的值变化，并在变化时执行赋值操作
- this.query.workorder_code = newVal;
- this.executeQuery();
+ this.query.workorder_code = newVal
+ this.executeQuery()
}
- },
- methods: {
- open() {
+ },
+ methods: {
+ open() {
- },
- close() {
- this.crud.resetQuery(false)
- this.$emit('update:dialogShow', false)
- },
- executeQuery() {
- this.crud.toQuery();
- },
+ },
+ close() {
+ this.crud.resetQuery(false)
+ this.$emit('update:dialogShow', false)
+ },
+ executeQuery() {
+ this.crud.toQuery()
+ },
doOperate(row) {
- this.productname=row.matnr
- this.workorder_code=row.workorder_code
+ this.productname = row.matnr
+ this.workorder_code = row.workorder_code
this.pointDetailDialog = true
}
- }
}
- </script>
+}
+</script>
<style rel="stylesheet/scss" lang="scss" scoped>
::v-deep .el-dialog__body {
padding-top: 0px;
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
index 1a9bb2d..2fab397 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
@@ -270,7 +270,7 @@
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料标识')" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_name',crud.data,'物料标识')" /> -->
<!-- <el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型', 20)"> -->
- <!-- <template slot-scope="scope">
+ <!-- <template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column> -->
@@ -384,7 +384,7 @@ const defaultForm = {
export default {
name: 'PdmBdWorkorder',
dicts: ['vehicle_type', 'pdm_workorder_status'],
- components: { WorkOrderDetailDialog,MaterialDialog, pagination, crudOperation, rrOperation, udOperation },
+ components: { WorkOrderDetailDialog, MaterialDialog, pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -497,7 +497,7 @@ export default {
this.crud.toQuery()
},
doOperate(row) {
- this.message=row.workorder_code
+ this.message = row.workorder_code
this.workOrderDetailDialog = true
}
}
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerordertwo/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerordertwo/index.vue
index 6f534ba..680e32b 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerordertwo/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerordertwo/index.vue
@@ -10,7 +10,7 @@
label-width="90px"
label-suffix=":"
>
- <el-form-item label="出库单号">
+ <el-form-item label="出库单号">
<el-input
v-model="query.somtOrderNo"
clearable
@@ -68,11 +68,11 @@
<el-table-column prop="productDescription" label="物料描述" :min-width="flexWidth('productDescription',crud.data,'物料描述')" />
<el-table-column prop="supplierCode" label="客户编码" :min-width="flexWidth('supplierCode',crud.data,'客户编码')" />
<el-table-column prop="supplierName" label="客户名称" :min-width="flexWidth('supplierName',crud.data,'客户名称')" />
- <el-table-column prop="createTime" label="创建日期" width="150">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
- </template>
- </el-table-column>
+ <el-table-column prop="createTime" label="创建日期" width="150">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.createTime) }}</span>
+ </template>
+ </el-table-column>
<el-table-column v-permission="[]" label="操作" width="70px" align="center" fixed="right">
<template slot-scope="scope">
<el-button
@@ -100,7 +100,7 @@ import pagination from '@crud/Pagination'
import PointDetailDialog from '@/views/wms/pdm/workerordertwo/PointDetailDialog.vue'
export default {
- name: 'workorder',
+ name: 'Workorder',
components: { PointDetailDialog, pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), crud()],
cruds() {
@@ -115,7 +115,7 @@ export default {
del: false,
download: false,
reset: false
- },
+ }
})
},
data() {
@@ -130,7 +130,7 @@ export default {
workorder_code: '',
productname: '',
pointList: [],
- pointDetailDialog:false,
+ pointDetailDialog: false,
message: null
}
},
@@ -142,8 +142,8 @@ export default {
return true
},
doOperate(row) {
- this.workorder_code=row.moname
- this.productname=row.productName
+ this.workorder_code = row.moname
+ this.productname = row.productName
this.pointDetailDialog = true
}
}
diff --git a/lms/nladmin-ui/src/views/wms/sch/data/index.vue b/lms/nladmin-ui/src/views/wms/sch/data/index.vue
index c83dd5a..d4b9979 100644
--- a/lms/nladmin-ui/src/views/wms/sch/data/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/data/index.vue
@@ -28,10 +28,10 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
- <el-table-column prop="supplierCode" label="客户编码" min-width="100"/>
- <el-table-column prop="supplierName" label="客户名称" min-width="150"/>
- <el-table-column prop="productName" label="物料编码" in-width="150"/>
- <el-table-column prop="date" label="日期"/>
+ <el-table-column prop="supplierCode" label="客户编码" min-width="100" />
+ <el-table-column prop="supplierName" label="客户名称" min-width="150" />
+ <el-table-column prop="productName" label="物料编码" in-width="150" />
+ <el-table-column prop="date" label="日期" />
<el-table-column prop="specification" label="规格" />
<el-table-column prop="batch" label="来料批次" />
<el-table-column prop="barLevel" label="棒源等级" />
@@ -84,7 +84,7 @@ export default {
reset: false
},
query: {
- //start_time: new Date().format('yyyy-MM-dd')
+ // start_time: new Date().format('yyyy-MM-dd')
}
})
},
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
index 3e7208b..f1b47a1 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
@@ -4,28 +4,28 @@
<div class="head-container">
<div v-if="crud.props.searchToggle">
<el-dialog
- title="选择异常出库原因"
- :visible.sync="reasonDialogVisible"
- width="30%"
- :before-close="closeReasonDialog"
- >
- <el-form ref="reasonForm" :model="reasonForm" label-width="80px">
- <el-form-item label="原因" prop="reason">
- <el-select v-model="reasonForm.reason" placeholder="请选择异常出库原因">
- <el-option
- v-for="item in dict.reason"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button @click="closeReasonDialog">取消</el-button>
- <el-button type="primary" @click="submitReason">确认</el-button>
- </div>
- </el-dialog>
+ title="选择异常出库原因"
+ :visible.sync="reasonDialogVisible"
+ width="30%"
+ :before-close="closeReasonDialog"
+ >
+ <el-form ref="reasonForm" :model="reasonForm" label-width="80px">
+ <el-form-item label="原因" prop="reason">
+ <el-select v-model="reasonForm.reason" placeholder="请选择异常出库原因">
+ <el-option
+ v-for="item in dict.reason"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="closeReasonDialog">取消</el-button>
+ <el-button type="primary" @click="submitReason">确认</el-button>
+ </div>
+ </el-dialog>
<el-form
:inline="true"
class="demo-form-inline"
@@ -185,19 +185,19 @@
>
缓存区一键移库
</el-button>
- <!-- Confirmation Dialog -->
+ <!-- Confirmation Dialog -->
</crudOperation>
<el-dialog
- title="确认"
- :visible.sync="dialogVisible"
- width="30%"
- >
- <span>您确定要移库吗？</span>
- <span slot="footer" class="dialog-footer">
- <el-button @click="dialogVisible = false">取消</el-button>
- <el-button type="primary" @click="confirmMove">确定</el-button>
- </span>
- </el-dialog>
+ title="确认"
+ :visible.sync="dialogVisible"
+ width="30%"
+ >
+ <span>您确定要移库吗？</span>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="dialogVisible = false">取消</el-button>
+ <el-button type="primary" @click="confirmMove">确定</el-button>
+ </span>
+ </el-dialog>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="540px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;">
@@ -366,7 +366,7 @@
:permission="permission"
/>
<el-button
- v-if="showQtyButton(scope.row.vehicle_qty,scope.row.region_code)"
+ v-if="showQtyButton(scope.row.vehicle_qty,scope.row.region_code)"
size="mini"
type="text"
icon="el-icon-view"
@@ -439,7 +439,7 @@ const defaultForm = {
}
export default {
name: 'SchBasePoint',
- dicts: ['vehicle_type', 'TrueOrFalse','reason'],
+ dicts: ['vehicle_type', 'TrueOrFalse', 'reason'],
components: { PointDialog, ViewDialog, pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -478,9 +478,9 @@ export default {
region_code: [
{ required: true, message: '区域类型不能为空', trigger: 'blur' }
]
- },reasonDialogVisible: false,
+ }, reasonDialogVisible: false,
reasonForm: {
- reason: ""
+ reason: ''
},
workShopList: [],
regionList: [],
@@ -489,7 +489,7 @@ export default {
pointStatusDialogList: [],
pointTypesDialogList: [],
pointDialog: false,
- dialogVisible: false,
+ dialogVisible: false
}
},
created() {
@@ -559,8 +559,8 @@ export default {
this.crud.toQuery()
})
},
- showQtyButton(vehicle_qty,region_code) {
- if (vehicle_qty === 1 && (region_code === 'YL'|| region_code === 'YLHC')) {
+ showQtyButton(vehicle_qty, region_code) {
+ if (vehicle_qty === 1 && (region_code === 'YL' || region_code === 'YLHC')) {
return true
}
return false
@@ -587,52 +587,52 @@ export default {
this.crud.query.point_type = null
this.crud.query.point_status = null
this.hand()
- },openReasonDialog(row) {
+ }, openReasonDialog(row) {
// 打开选择原因的对话框
- this.reasonDialogVisible = true;
+ this.reasonDialogVisible = true
// 这里可以将row存储到data中，以便在提交时使用
- this.selectedRow = row;
- },closeReasonDialog() {
+ this.selectedRow = row
+ }, closeReasonDialog() {
// 关闭选择原因的对话框
- this.reasonDialogVisible = false;
- this.$refs["reasonForm"].resetFields();
- },submitReason() {
+ this.reasonDialogVisible = false
+ this.$refs['reasonForm'].resetFields()
+ }, submitReason() {
// 提交选择的原因到后端接口
const data = {
reason: this.reasonForm.reason,
device_code: this.selectedRow.point_code
- };
+ }
// 调用后端接口提交数据
// 这里假设使用axios库发送POST请求
this.$axios
- .post("/api/schBasePoint/outbound", data)
+ .post('/api/schBasePoint/outbound', data)
.then(response => {
// 处理后端返回的数据
- console.log("提交成功", response);
- this.$message.success("提交成功");
- this.closeReasonDialog();
+ console.log('提交成功', response)
+ this.$message.success('提交成功')
+ this.closeReasonDialog()
})
.catch(error => {
// 处理错误情况
- console.error("提交失败,废包材位有货", error);
- this.$message.error("提交失败,废包材位有货");
- });
- },showConfirmationDialog() {
- this.dialogVisible = true;
+ console.error('提交失败,废包材位有货', error)
+ this.$message.error('提交失败,废包材位有货')
+ })
+ }, showConfirmationDialog() {
+ this.dialogVisible = true
},
confirmMove() {
- this.$axios.post('/api/schBaseTask/move', { })
+ this.$axios.post('/api/schBaseTask/move', { })
.then(response => {
- console.log(response.data);
+ console.log(response.data)
})
.catch(error => {
// Handle error response
- console.error(error);
+ console.error(error)
})
.finally(() => {
- this.dialogVisible = false; // Close the dialog
- });
- },
+ this.dialogVisible = false // Close the dialog
+ })
+ }
}
}
</script>
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/schBasePoint.js b/lms/nladmin-ui/src/views/wms/sch/point/schBasePoint.js
index 5d9f0fd..d44080c 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/schBasePoint.js
+++ b/lms/nladmin-ui/src/views/wms/sch/point/schBasePoint.js
@@ -47,7 +47,7 @@ export function getPointsByRegionCodes(data) {
})
}
export function getCBPointList(data) {
- data ={ region_code: 'CB' }
+ data = { region_code: 'CB' }
return request({
url: 'api/schBasePoint/getPointList',
method: 'post',
@@ -55,4 +55,4 @@ export function getCBPointList(data) {
})
}
-export default { add, edit, del, changeUsed, getPointList,getCBPointList,getPointsByRegionCodes }
+export default { add, edit, del, changeUsed, getPointList, getCBPointList, getPointsByRegionCodes }
diff --git a/lms/nladmin-ui/src/views/wms/sch/report/index.vue b/lms/nladmin-ui/src/views/wms/sch/report/index.vue
index e8b188c..8bb0701 100644
--- a/lms/nladmin-ui/src/views/wms/sch/report/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/report/index.vue
@@ -10,7 +10,7 @@
label-width="90px"
label-suffix=":"
>
- <el-form-item label="点位编码">
+ <el-form-item label="点位编码">
<el-select
v-model="query.point_code"
clearable
@@ -131,7 +131,7 @@ import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
export default {
name: 'Report',
- components: {pagination, crudOperation, rrOperation, udOperation },
+ components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({
@@ -187,12 +187,12 @@ export default {
this.pointList = res
})
},
- getSupplierNameList(){
+ getSupplierNameList() {
crudMaterial.getSupplierNameList().then(res => {
this.supplierNameList = res.content
})
},
- getProductDescriptionList(){
+ getProductDescriptionList() {
crudMaterial.getProductDescriptionList().then(res => {
this.productDescriptionList = res.content
})
diff --git a/lms/nladmin-ui/src/views/wms/ycl/detail/index.vue b/lms/nladmin-ui/src/views/wms/ycl/detail/index.vue
index ba3151d..b17225d 100644
--- a/lms/nladmin-ui/src/views/wms/ycl/detail/index.vue
+++ b/lms/nladmin-ui/src/views/wms/ycl/detail/index.vue
@@ -93,7 +93,7 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表格渲染-->
- <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler" height="550">
+ <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" height="550" @selection-change="crud.selectionChangeHandler">
<el-table-column prop="pointCode" label="点位编码" :min-width="flexWidth('pointCode',crud.data,'点位编码')" />
<el-table-column prop="pointName" label="点位名称" :min-width="flexWidth('pointName',crud.data,'点位名称')" />
<el-table-column v-if="false" prop="regionCode" label="区域编码" :min-width="flexWidth('regionCode',crud.data,'区域编码')" />
@@ -111,11 +111,11 @@
<el-table-column prop="weightCoefficientValue" label="折算系数" :min-width="flexWidth('weightCoefficientValue',crud.data,'折算系数')" />
<el-table-column prop="incomingLength" label="来料长度mm" :min-width="flexWidth('incomingLength',crud.data,'来料长度mm')" />
<el-table-column prop="incomingchipping" label="来料缺陷长度mm" :min-width="flexWidth('incomingchipping',crud.data,'来料缺陷长度mm')" />
- <el-table-column label="有效长度mm" :min-width="flexWidth('effectiveLength', crud.data, '有效长度mm')" >
- <template slot-scope="scope">
- {{ getEffectiveLength(scope.row) }}
- </template>
- </el-table-column>
+ <el-table-column label="有效长度mm" :min-width="flexWidth('effectiveLength', crud.data, '有效长度mm')">
+ <template slot-scope="scope">
+ {{ getEffectiveLength(scope.row) }}
+ </template>
+ </el-table-column>
</el-table>
<!--分页组件-->
<pagination />
@@ -200,7 +200,7 @@ export default {
})
},
getEffectiveLength(row) {
- return (row.incomingLength - row.incomingchipping).toFixed(2);
+ return (row.incomingLength - row.incomingchipping).toFixed(2)
}
}
}
diff --git a/lms/nladmin-ui/src/views/wms/ycl/outdetail/detail.js b/lms/nladmin-ui/src/views/wms/ycl/outdetail/detail.js
index 4be38c4..101c563 100644
--- a/lms/nladmin-ui/src/views/wms/ycl/outdetail/detail.js
+++ b/lms/nladmin-ui/src/views/wms/ycl/outdetail/detail.js
@@ -64,4 +64,4 @@ export function getIngotBatchList(data) {
})
}
-export default { add, edit, del, getGroup, getSupplierNameList, getProductDescriptionList, getLotSNList,getIngotBatchList }
+export default { add, edit, del, getGroup, getSupplierNameList, getProductDescriptionList, getLotSNList, getIngotBatchList }
diff --git a/lms/nladmin-ui/src/views/wms/ycl/outdetail/index.vue b/lms/nladmin-ui/src/views/wms/ycl/outdetail/index.vue
index 65d01e4..56c790c 100644
--- a/lms/nladmin-ui/src/views/wms/ycl/outdetail/index.vue
+++ b/lms/nladmin-ui/src/views/wms/ycl/outdetail/index.vue
@@ -105,8 +105,7 @@
:max="10000"
:step="10"
size="mini"
- >
- </el-input-number>
+ />
</el-form-item>
<rrOperation />
</el-form>
@@ -137,20 +136,22 @@
</el-button>
</crudOperation>
<!--表格渲染-->
- <el-table ref="table"
- v-loading="crud.loading"
- :data="crud.data"
- size="mini"
- :cell-style="cellStyle"
- style="width: 100%;"
- @selection-change="handleSelectionChange"
- height="550">
+ <el-table
+ ref="table"
+ v-loading="crud.loading"
+ :data="crud.data"
+ size="mini"
+ :cell-style="cellStyle"
+ style="width: 100%;"
+ height="550"
+ @selection-change="handleSelectionChange"
+ >
<el-table-column type="selection" width="55" />
<el-table-column prop="pointCode" label="点位名称" :min-width="flexWidth('pointCode',crud.data,'点位名称')" />
<el-table-column prop="regionName" label="区域名称" :min-width="flexWidth('regionName',crud.data,'区域名称')" />
<el-table-column prop="subTray" label="子托编码" :min-width="flexWidth('subTray',crud.data,'子托编码')" />
<el-table-column prop="motherTray" label="母托编码" :min-width="flexWidth('motherTray',crud.data,'母托编码')" />
-<!-- <el-table-column prop="somtOrderNo" label="出库单号" :min-width="flexWidth('somtOrderNo',crud.data,'出库单号')" />-->
+ <!-- <el-table-column prop="somtOrderNo" label="出库单号" :min-width="flexWidth('somtOrderNo',crud.data,'出库单号')" />-->
<el-table-column prop="moname" label="生产工单" :min-width="flexWidth('moname',crud.data,'生产工单')" />
<el-table-column prop="status" label="工单状态" :formatter="format_work_order_two_status" :min-width="flexWidth('status',crud.data,'工单状态')" />
<el-table-column prop="supplierName" label="供应商名称" :min-width="flexWidth('supplierName',crud.data,'供应商名称')" />
@@ -176,7 +177,7 @@ import pagination from '@crud/Pagination'
import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
export default {
- name: 'outdetail',
+ name: 'Outdetail',
dicts: ['work_order_two_status'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), crud()],
@@ -232,28 +233,28 @@ export default {
}
// 获取选中行的托盘号 subTray
- const palletSNs = this.rows.map(row => row.subTray);
+ const palletSNs = this.rows.map(row => row.subTray)
// 弹出输入回温时间和回温模式的对话框
- this.$prompt('请输入回温模式（0-普通模式，1-快速模式）', '提示', {
- inputPattern: /^[0-1]$/,
- inputErrorMessage: '输入内容必须是 0 或 1',
- confirmButtonText: '确定',
- cancelButtonText: '取消'
- }).then(({ value: mode }) => {
- // 提交数据给后台接口
- this.$axios.post('/api/workorder/batchChange', {
- pointCodes : palletSNs,
- mode : mode,
- status : '1'
- }).then(response => {
- // 提交成功处理
- this.$message.success('出库提交成功！');
- this.crud.toQuery()
- }).catch(error => {
- // 提交失败处理
- this.$message.error('出库提交失败，请重试');
- });
+ this.$prompt('请输入回温模式（0-普通模式，1-快速模式）', '提示', {
+ inputPattern: /^[0-1]$/,
+ inputErrorMessage: '输入内容必须是 0 或 1',
+ confirmButtonText: '确定',
+ cancelButtonText: '取消'
+ }).then(({ value: mode }) => {
+ // 提交数据给后台接口
+ this.$axios.post('/api/workorder/batchChange', {
+ pointCodes: palletSNs,
+ mode: mode,
+ status: '1'
+ }).then(response => {
+ // 提交成功处理
+ this.$message.success('出库提交成功！')
+ this.crud.toQuery()
+ }).catch(error => {
+ // 提交失败处理
+ this.$message.error('出库提交失败，请重试')
})
+ })
},
cancle() {
this.rows = this.$refs.table.selection
@@ -262,33 +263,33 @@ export default {
return
}
// 获取选中行的托盘号 subTray
- const palletSNs = this.rows.map(row => row.subTray);
- // 提交数据给后台接口
- this.$axios.post('/api/workorder/batchChange', {
- pointCodes : palletSNs,
- mode : '0',
- status : '0'
- }).then(response => {
- // 提交成功处理
- this.$message.success('出库取消成功！');
- this.crud.toQuery()
- }).catch(error => {
- // 提交失败处理
- this.$message.error('出库取消失败，请重试');
- });
+ const palletSNs = this.rows.map(row => row.subTray)
+ // 提交数据给后台接口
+ this.$axios.post('/api/workorder/batchChange', {
+ pointCodes: palletSNs,
+ mode: '0',
+ status: '0'
+ }).then(response => {
+ // 提交成功处理
+ this.$message.success('出库取消成功！')
+ this.crud.toQuery()
+ }).catch(error => {
+ // 提交失败处理
+ this.$message.error('出库取消失败，请重试')
+ })
},
handleSelectionChange(val, row) {
this.rows = this.$refs.table.selection
- var strs = '';
+ var strs = ''
this.handleCurrentChange(null)
if (this.rows.length > 0) {
this.rows.forEach(now => {
strs += now.status
})
- if(strs.indexOf('1') != -1){
+ if (strs.indexOf('1') != -1) {
this.confirm_flag = true
}
- if(strs.indexOf('0') != -1){
+ if (strs.indexOf('0') != -1) {
this.cancle_flag = true
}
}
@@ -302,19 +303,19 @@ export default {
cellStyle({ row, column, rowIndex, columnIndex }) {
const status = row.status
- if (column.property === 'status') {
- if (status == '1') {
- return 'background: #13ce66'
- }else {
- return 'background: #FFBA00'
- }
+ if (column.property === 'status') {
+ if (status == '1') {
+ return 'background: #13ce66'
+ } else {
+ return 'background: #FFBA00'
}
+ }
},
format_work_order_two_status(row, column) {
return this.dict.label.work_order_two_status[row.status]
},
getPointList() { // 获取点位列表
- crudSchBasePoint.getPointsByRegionCodes("YL,YLHC,KJHC").then(res => {
+ crudSchBasePoint.getPointsByRegionCodes('YL,YLHC,KJHC').then(res => {
this.pointList = res
})
},