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

rev

Browse Source
This commit is contained in:
张江玮
2023-09-05 15:00:24 +08:00
parent bae18a1394
commit 6a5c490676
100 changed files with 1161 additions and 1525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-ui/src/views/wms/sch/point/MaterialDialog.vue
View File

@@ -47,13 +47,13 @@
<el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" width="160" />
<el-table-column prop="material_number" label="物料号" width="160" />
<el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" width="140" />
<el-table-column prop="material_model" label="物料型号" />
<el-table-column prop="class_name" label="物料分类" width="140" />
<el-table-column prop="unit_name" label="计量单位" />
<el-table-column prop="standing_time" label="静置时间（分钟）" width="130px" />
<el-table-column prop="stand_time" label="静置时间（分钟）" width="130px" />
<el-table-column prop="product_series_name" label="系列" />
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="135" />

100
lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
View File

@@ -14,36 +14,36 @@
</div>
<el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="区域编码">
<el-input v-model="form.region_code" style="width: 200px;"/>
<el-form-item label="区域号">
<el-input v-model="form.region_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="区域名称">
<el-input v-model="form.region_name" style="width: 200px;"/>
<el-input v-model="form.region_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="点位编码">
<el-input v-model="form.point_code" style="width: 200px;"/>
<el-form-item label="点位号">
<el-input v-model="form.point_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="点位名称">
<el-input v-model="form.point_name" style="width: 200px;"/>
<el-input v-model="form.point_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="点位类型">
<el-input v-model="form.point_type_name" style="width: 200px;"/>
<el-input v-model="form.point_type_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="点位状态">
<el-input v-model="form.point_status_name" style="width: 200px;"/>
<el-input v-model="form.point_status_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="锁定类型">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
<el-input v-model="form.lock_type_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="载具类型">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
<el-input v-model="form.lock_type_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="载具编码">
<el-input v-model="form.vehicle_code" style="width: 200px;"/>
<el-form-item label="载具号">
<el-input v-model="form.vehicle_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="载具数量">
<el-input v-model="form.vehicle_qty" style="width: 200px;"/>
<el-input v-model="form.vehicle_qty" style="width: 200px;" />
</el-form-item>
</el-form>
@@ -56,30 +56,30 @@
</div>
<el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="物料编码">
<el-input v-model="form.region_code" style="width: 200px;"/>
<el-form-item label="物料号">
<el-input v-model="form.region_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料名称">
<el-input v-model="form.region_name" style="width: 200px;"/>
<el-input v-model="form.region_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料规格">
<el-input v-model="form.point_code" style="width: 200px;"/>
<el-input v-model="form.point_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料批次">
<el-input v-model="form.point_name" style="width: 200px;"/>
<el-input v-model="form.point_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="库存量">
<el-input v-model="form.point_type_name" style="width: 200px;"/>
<el-input v-model="form.point_type_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="计量单位">
<el-input v-model="form.point_status_name" style="width: 200px;"/>
<el-input v-model="form.point_status_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="入库时间">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
<el-input v-model="form.lock_type_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="静置时间(分)">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
<el-input v-model="form.lock_type_name" style="width: 200px;" />
</el-form-item>
</el-form>
</el-card>
@@ -91,30 +91,30 @@
</div>
<el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="物料编码">
<el-input v-model="form.region_code" style="width: 200px;"/>
<el-form-item label="物料号">
<el-input v-model="form.region_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料名称">
<el-input v-model="form.region_name" style="width: 200px;"/>
<el-input v-model="form.region_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料规格">
<el-input v-model="form.point_code" style="width: 200px;"/>
<el-input v-model="form.point_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料批次">
<el-input v-model="form.point_name" style="width: 200px;"/>
<el-input v-model="form.point_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="库存量">
<el-input v-model="form.point_type_name" style="width: 200px;"/>
<el-input v-model="form.point_type_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="计量单位">
<el-input v-model="form.point_status_name" style="width: 200px;"/>
<el-input v-model="form.point_status_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="入库时间">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
<el-input v-model="form.lock_type_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="静置时间(分)">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
<el-input v-model="form.lock_type_name" style="width: 200px;" />
</el-form-item>
</el-form>
</el-card>
@@ -126,30 +126,30 @@
</div>
<el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="物料编码">
<el-input v-model="form.region_code" style="width: 200px;"/>
<el-form-item label="物料号">
<el-input v-model="form.region_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料名称">
<el-input v-model="form.region_name" style="width: 200px;"/>
<el-input v-model="form.region_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料规格">
<el-input v-model="form.point_code" style="width: 200px;"/>
<el-input v-model="form.point_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料批次">
<el-input v-model="form.point_name" style="width: 200px;"/>
<el-input v-model="form.point_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="库存量">
<el-input v-model="form.point_type_name" style="width: 200px;"/>
<el-input v-model="form.point_type_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="计量单位">
<el-input v-model="form.point_status_name" style="width: 200px;"/>
<el-input v-model="form.point_status_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="入库时间">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
<el-input v-model="form.lock_type_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="静置时间(分)">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
<el-input v-model="form.lock_type_name" style="width: 200px;" />
</el-form-item>
</el-form>
</el-card>
@@ -169,15 +169,15 @@
:highlight-current-row="true"
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column prop="device_code" label="设备编码" align="center"/>
<el-table-column prop="device_name" label="设备名称" align="center" min-width="200" show-overflow-tooltip/>
<el-table-column prop="produce_qty" label="生产数量" align="center"/>
<el-table-column prop="init_qty" label="期初数量" align="center"/>
<el-table-column prop="finish_qty" label="期末数量" align="center"/>
<el-table-column prop="finishproduct_qty" label="完成数量" align="center"/>
<el-table-column prop="operatetime_start" label="开始时间" align="center" min-width="130" show-overflow-tooltip/>
<el-table-column prop="operatetime_end" label="结束时间" align="center" min-width="130" show-overflow-tooltip/>
<el-table-column prop="nick_name" label="操作人" align="center"/>
<el-table-column prop="device_code" label="设备号" align="center" />
<el-table-column prop="device_name" label="设备名称" align="center" min-width="200" show-overflow-tooltip />
<el-table-column prop="produce_qty" label="生产数量" align="center" />
<el-table-column prop="init_qty" label="期初数量" align="center" />
<el-table-column prop="finish_qty" label="期末数量" align="center" />
<el-table-column prop="finishproduct_qty" label="完成数量" align="center" />
<el-table-column prop="operatetime_start" label="开始时间" align="center" min-width="130" show-overflow-tooltip />
<el-table-column prop="operatetime_end" label="结束时间" align="center" min-width="130" show-overflow-tooltip />
<el-table-column prop="nick_name" label="操作人" align="center" />
</el-table>
</el-card>
<!--<span slot="footer" class="dialog-footer">
@@ -217,7 +217,7 @@ export default {
plan_qty: null,
real_qty: null,
material_id: null,
material_code: null,
material_number: null,
material_weight: null,
planproducestart_date: null,
planproduceend_date: null,

4
lms/nladmin-ui/src/views/wms/sch/point/WorkOrderDialog.vue
View File

@@ -47,10 +47,10 @@
<el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
</template>
</el-table-column>
<el-table-column prop="workorder_code" label="工单编号" width="120px"/>
<el-table-column prop="workorder_code" label="工单编号" width="120px" />
<el-table-column v-if="false" prop="material_id" label="物料标识" />
<el-table-column prop="device_name" label="设备" width="100" show-overflow-tooltip />
<el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
<el-table-column prop="material_number" label="物料号" width="100" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" width="100" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip />
<el-table-column prop="vehicle_type" label="载具类型" min-width="120" show-overflow-tooltip>

20
lms/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -10,11 +10,11 @@
label-width="90px"
label-suffix="："
>
<el-form-item label="编码/名称">
<el-form-item label="号/名称">
<el-input
v-model="query.name"
clearable
placeholder="编码/名称"
placeholder="号/名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
@@ -134,7 +134,7 @@
width="600px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px" label-suffix="：">
<el-form-item label="点位编码" prop="point_code">
<el-form-item label="点位号" prop="point_code">
<el-input v-model="form.point_code" :disabled="crud.status.edit" style="width: 300px" />
</el-form-item>
<el-form-item label="点位名称" prop="point_name">
@@ -218,8 +218,8 @@
/>
</el-select>
</el-form-item>
<el-form-item v-show="crud.status.edit" label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" placeholder="载具编码" clearable style="width: 300px" />
<el-form-item v-show="crud.status.edit" label="载具号" prop="vehicle_code">
<el-input v-model="form.vehicle_code" placeholder="载具号" clearable style="width: 300px" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 300px" rows="2" type="textarea" />
@@ -240,7 +240,7 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
<el-table-column prop="point_code" label="点位号" :min-width="flexWidth('point_code',crud.data,'点位号')" />
<el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
<el-table-column prop="region_name" label="所属区域" :min-width="flexWidth('region_name',crud.data,'所属区域')" />
<el-table-column prop="point_type_name" label="点位类型" :min-width="flexWidth('point_type_name',crud.data,'点位类型')" />
@@ -264,8 +264,8 @@
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="vehicle_code" label="载具号" :min-width="flexWidth('vehicle_code',crud.data,'载具号')" />
<el-table-column prop="material_number" label="物料号" :min-width="flexWidth('material_number',crud.data,'物料号')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" show-overflow-tooltip />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
@@ -310,7 +310,7 @@ const defaultForm = {
point_code: null,
point_name: null,
point_type: null,
point_status: '0',
point_status: '1',
lock_type: '1',
vehicle_code: null,
source_id: null,
@@ -365,7 +365,7 @@ export default {
deviceList: [],
rules: {
point_code: [
{ required: true, message: '点位编码不能为空', trigger: 'blur' }
{ required: true, message: '点位号不能为空', trigger: 'blur' }
],
point_name: [
{ required: true, message: '点位名称不能为空', trigger: 'blur' }