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

merge:合并一期代码到当前分支

Browse Source
This commit is contained in:
zhouz
2025-11-27 16:10:34 +08:00
parent 8813eed262 6b52fb7a99
commit 422b234821
42 changed files with 845 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
View File

@@ -295,7 +295,9 @@
<el-table-column prop="joint_type" label="接头数" min-width="150" />
<el-table-column prop="sub_type" label="子卷状态" min-width="150" :formatter="formatSubType" />
<el-table-column prop="produce_age" label="生产时长（天）" min-width="120" />
<el-table-column prop="paper_type" label="品质类型" min-width="150" />
<el-table-column prop="demand_limit" label="客户需求抗拉下限" min-width="130" />
<el-table-column prop="demand_up" label="客户需求抗拉上限" min-width="130" />
<el-table-column prop="paper_type" label="管件类型" min-width="150" />
<el-table-column prop="paper_code" label="管件编码" min-width="150" />
<el-table-column prop="paper_name" label="管件描述" min-width="250" />
<el-table-column prop="remark" label="超期原因" min-width="250">

6
lms/nladmin-ui/src/views/wms/control/ivt/index.vue
View File

@@ -219,7 +219,7 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<!-- <el-table-column type="selection" width="55" />-->
<!-- <el-table-column type="selection" width="55" />-->
<el-table-column
prop="struct_code"
label="仓位编码"
@@ -266,10 +266,10 @@
<el-table-column prop="joint_type" label="接头数" min-width="150" />
<el-table-column prop="sub_type" label="子卷状态" min-width="150" :formatter="formatSubType" />
<el-table-column prop="produce_age" label="生产时长（天）" min-width="120" />
<el-table-column prop="paper_type" label="品质类型" min-width="150" />
<el-table-column prop="paper_type" label="管件类型" min-width="150" />
<el-table-column prop="paper_code" label="管件编码" min-width="150" />
<el-table-column prop="paper_name" label="管件描述" min-width="250" />
<!-- <el-table-column prop="remark" label="超期原因" min-width="250">
<!-- <el-table-column prop="remark" label="超期原因" min-width="250">
<template scope="scope">
<el-select
v-model="scope.row.remark"

1
lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
View File

@@ -635,7 +635,6 @@
/>
<el-table-column
prop="width_standard"
:formatter="crud.formatNum0"
label="客户要求幅宽"
:min-width="flexWidth('width_standard',crud.data,'客户要求幅宽')"
/>

37
lms/nladmin-ui/src/views/wms/st/inStor/productscrap/AddDialog.vue
View File

@@ -10,7 +10,7 @@
>
<el-row v-show="crud.status.cu > 0" :gutter="20">
<el-col :span="20" style="border: 1px solid white">
<span/>
<span />
</el-col>
<el-col :span="4">
<span>
@@ -36,11 +36,11 @@
label-width="85px"
label-suffix=":"
>
<el-input v-show="false" v-model="form.stor_code" placeholder="仓库编码"/>
<el-input v-show="false" v-model="form.stor_name" placeholder="仓库名称"/>
<el-input v-show="false" v-model="form.stor_code" placeholder="仓库编码" />
<el-input v-show="false" v-model="form.stor_name" placeholder="仓库名称" />
<el-form-item label="单据号" prop="scrap_code">
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.scrap_code" disabled placeholder="系统生成" clearable style="width: 210px"/>
<el-input v-model="form.scrap_code" disabled placeholder="系统生成" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="仓库" prop="stor_id">
<label slot="label">仓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;库:</label>
@@ -79,7 +79,7 @@
<el-form-item label="明细数" prop="detail_count">
<label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
<el-input v-model="form.detail_count" size="mini" disabled style="width: 210px"/>
<el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="总重量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
@@ -116,9 +116,9 @@
<el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}" style="margin-top: 5px;">
<el-form ref="form2" :inline="true" :model="form" :rules="rules" size="mini">
<el-form-item label="不合格品缺陷描述" prop="dtl_remark">
<el-input v-model="form.dtl_remark" :disabled="crud.status.view > 0" class="input-with-select"/>
<el-input v-model="form.dtl_remark" :disabled="crud.status.view > 0" class="input-with-select" />
</el-form-item>
<!-- <el-form-item label="不合格品来源" prop="fail_source">
<!-- <el-form-item label="不合格品来源" prop="fail_source">
<el-select
v-model="form.fail_source"
class="input-with-select"
@@ -134,14 +134,14 @@
</el-select>
</el-form-item>-->
</el-form>
<el-button class="filter-item" :disabled="crud.status.view > 0" @click="allSend()" size="medium" icon="el-icon-plus" style="float: right; padding: 3px 0" type="warning">填充</el-button>
<el-button class="filter-item" :disabled="crud.status.view > 0" size="medium" icon="el-icon-plus" style="float: right; padding: 3px 0" type="warning" @click="allSend()">填充</el-button>
</el-card>
<div class="crud-opts2">
<span class="role-span">不合格品明细</span>
<span v-if="crud.status.cu > 0" class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left"/>
<slot name="left" />
<el-button
slot="left"
class="filter-item"
@@ -191,8 +191,8 @@
<el-select
v-model="scope.row.fail_source"
class="input-with-select"
@input="custNameInput2(form.tableData[scope.$index])"
:disabled="crud.status.view > 0"
@input="custNameInput2(form.tableData[scope.$index])"
>
<el-option
v-for="item in dict.FAIL_SOURCE"
@@ -205,12 +205,17 @@
</el-table-column>
<el-table-column key="8" width="150" prop="remark" label="不合格品缺陷描述">
<template scope="scope">
<el-input v-model="scope.row.remark" @input="custNameInput(form.tableData[scope.$index])" :disabled="crud.status.view > 0" class="input-with-select" />
<el-input v-model="scope.row.remark" :disabled="crud.status.view > 0" class="input-with-select" @input="custNameInput(form.tableData[scope.$index])" />
</template>
</el-table-column>
<el-table-column width="150" label="是否填充" v-if="crud.status.cu > 0">
<el-table-column v-if="crud.status.view > 0" key="9" prop="is_audit" label="是否出库" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.is_audit === '1' ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column v-if="crud.status.cu > 0" width="150" label="是否填充">
<template scope="scope">
<el-switch v-model="scope.row.is_used" @change="changeIsUsed(scope.row)" active-color="#13ce66" inactive-color="#ff4949" active-value="1" inactive-value="0" />
<el-switch v-model="scope.row.is_used" active-color="#13ce66" inactive-color="#ff4949" active-value="1" inactive-value="0" @change="changeIsUsed(scope.row)" />
</template>
</el-table-column>
<el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
@@ -225,9 +230,9 @@
</template>
</el-table-column>
</el-table>
<AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged"/>
<StructDiv ref="child" :dialog-show.sync="structShow" @tableChanged="structChanged"/>
<UploadDialog :dialog-show.sync="viewShow" :stor-id="paramViewShow" @tableChanged="tableChanged"/>
<AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged" />
<StructDiv ref="child" :dialog-show.sync="structShow" @tableChanged="structChanged" />
<UploadDialog :dialog-show.sync="viewShow" :stor-id="paramViewShow" @tableChanged="tableChanged" />
</el-dialog>
</template>

6
lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
View File

@@ -198,7 +198,7 @@
</el-form-item>-->
</el-form>
</div>
<span v-if="mstrow.stor_id !== '1582991156504039455'" class="crud-opts-right2">
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<!-- <el-button
@@ -213,7 +213,7 @@
设置站点
</el-button>-->
<el-button
v-if="this.mstrow.bill_type !== '1011'"
v-if="this.mstrow.bill_type !== '1011' && mstrow.stor_id !== '1582991156504039455'"
slot="left"
class="filter-item"
:loading="loadingSetPoint"
@@ -424,6 +424,8 @@ export default {
this.$refs['form2'].resetFields()
this.tabledis = []
this.$emit('DivChanged')
this.button5 = true
this.currentRow = {}
this.$emit('update:dialogShow', false)
},
bill_statusFormat(row, column) {

1
lms/nladmin-ui/src/views/wms/st/outcharge/index.vue
View File

@@ -289,6 +289,7 @@ export default {
crudOutchargefrom.charge(this.currentRow).then(res => {
this.crud.notify('单据确认成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
this.currentRow = null
})
}
}

3
lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue
View File

@@ -94,7 +94,7 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="订单行号">
<el-form-item label="订单行号">
<el-input
v-model="query.sale_order_name"
size="mini"
@@ -209,6 +209,7 @@
<el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'sap批次')" />
<el-table-column show-overflow-tooltip prop="net_weight" label="净重" :formatter="crud.formatNum2" :min-width="flexWidth('net_weight',crud.data,'净重')" />
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" :min-width="flexWidth('qty_unit_name',crud.data,'单位')" />
<el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="foil_container_name" label="生箔母卷" :min-width="flexWidth('foil_container_name',crud.data,'生箔母卷')" />
<el-table-column show-overflow-tooltip prop="customer_name" label="客户编码" :min-width="flexWidth('customer_name',crud.data,'客户编码')" />
<el-table-column show-overflow-tooltip prop="customer_description" label="客户名称" :min-width="flexWidth('customer_description',crud.data,'客户名称')" />
<el-table-column show-overflow-tooltip prop="sale_order_name" label="销售订单" :min-width="flexWidth('sale_order_name',crud.data,'销售订单')" />

1
lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue
View File

@@ -118,6 +118,7 @@
<el-table-column show-overflow-tooltip prop="cust_name" label="物流公司" :min-width="flexWidth('cust_name',crud.data,'物流公司')" />
<el-table-column show-overflow-tooltip prop="estimatedd_freight" label="运费" :formatter="crud.formatNum2" :min-width="flexWidth('estimated_freight',crud.data,'运费')" />
<el-table-column show-overflow-tooltip prop="box_no" label="木箱号" :min-width="flexWidth('box_no',crud.data,'木箱号')" />
<el-table-column show-overflow-tooltip prop="boxin_num" label="箱内子卷个数" :min-width="flexWidth('boxin_num',crud.data,'箱内子卷个数')" />
<el-table-column show-overflow-tooltip prop="box_material_code" label="木箱编码" :min-width="flexWidth('box_material_code',crud.data,'木箱编码')" />
<el-table-column show-overflow-tooltip prop="box_material_name" label="木箱描述" :min-width="flexWidth('box_material_name',crud.data,'木箱描述')" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />