diff --git a/src/api/wms/order.js b/src/api/wms/order.js
index 8ef3bb98..5677510d 100644
--- a/src/api/wms/order.js
+++ b/src/api/wms/order.js
@@ -25,6 +25,14 @@ export function addOrder(data) {
data: data
});
}
+//
+export function getIdCardList(data) {
+ return request({
+ url: '/wms/order/getIdCardList',
+ method: 'post',
+ data: data
+ });
+}
// 修改包材采购单
export function updateOrder(data) {
diff --git a/src/views/wms/order/index.vue b/src/views/wms/order/index.vue
index fb6bb3aa..dc6ea0d4 100644
--- a/src/views/wms/order/index.vue
+++ b/src/views/wms/order/index.vue
@@ -97,12 +97,24 @@
v-hasPermi="['wms:order:export']"
>导出</el-button>
</el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="info"
+ plain
+ icon="el-icon-printer"
+ size="mini"
+ :disabled="single"
+ @click="printIdCard"
+ v-hasPermi="['mes:pro:workorder:edit']"
+ >打印标识卡
+ </el-button>
+ </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="序号" type="index" :index='indexMethod'> </el-table-column>
+ <el-table-column label="序号" type="index" > </el-table-column>
<el-table-column label="工厂编码" align="center" prop="siteCode" v-if="false" />
<el-table-column label="id" align="center" prop="id" v-if="false" />
<el-table-column label="采购单号" align="center" prop="procureCode" min-width="200"/>
@@ -128,8 +140,8 @@
<span v-else-if="scope.row.orderStatus === '2'">收货完成</span>
</template>
</el-table-column>
- <el-table-column label="供应商编码" align="center" prop="supplierCode" />
- <el-table-column label="供应商名称" align="center" prop="supplierName" />
+ <el-table-column label="供应商编码" align="center" prop="supplierCode" min-width="200"/>
+ <el-table-column label="供应商名称" align="center" prop="supplierName" min-width="200"/>
<el-table-column label="备注" align="center" prop="Remark" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createDate" width="180">
@@ -238,8 +250,7 @@
</template>
<script>
-import { listOrder, getOrder, delOrder, addOrder, updateOrder } from "@/api/wms/order";
-
+import { listOrder, getOrder, delOrder, addOrder, updateOrder,getIdCardList } from "@/api/wms/order";
export default {
name: "Order",
data() {
@@ -411,7 +422,38 @@ export default {
}
});
},
- /** 删除按钮操作 */
+ printIdCard() {
+ // 确保有选中的 ID
+ if (this.ids.length === 0) {
+ this.$modal.msgError("请先选择至少一条订单进行打印。");
+ return;
+ }
+
+ // 获取所有选中的 ID
+ const selectedIds = this.ids;
+
+ // 批量获取身份证信息
+ Promise.all(selectedIds.map(id => getIdCardList({ id })))
+ .then(responses => {
+ responses.forEach(response => {
+ // 检查响应的状态
+ if (response.code === 200 ) {
+ this.$modal.msgSuccess(response.msg);
+ }
+ // 你可以在这里处理其他的业务逻辑，比如打印身份证信息等
+ });
+ })
+ .catch(error => {
+
+ this.$modal.msgError("打印失败: " + error.message);
+ });
+ },
+
+
+
+
+
+ /** 删除按钮操作 */
handleDelete(row) {
const IDs = row.id || this.ids;
this.$modal.confirm('是否确认删除包材采购单编号为"' + IDs + '"的数据项？').then(function() {
diff --git a/src/views/wms/put/index.vue b/src/views/wms/put/index.vue
index 7d241f4e..171dcfa9 100644
--- a/src/views/wms/put/index.vue
+++ b/src/views/wms/put/index.vue
@@ -236,6 +236,16 @@
v-hasPermi="['wms:put:add']"
>新增</el-button>
</el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-edit"
+ size="mini"
+ @click="handleUpdateKEN"
+ v-hasPermi="['wms:put:edit']"
+ >修改</el-button>
+ </el-col>
<el-col :span="1.5">
<el-button
type="success"
@@ -268,6 +278,7 @@
v-hasPermi="['wms:put:export']"
>导出</el-button>
</el-col>
+
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -357,36 +368,43 @@
<!-- 添加或修改成品生产入库对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="报工单号" prop="workOrder">
- <el-input v-model="form.workOrder" placeholder="请输入报工单号" />
- </el-form-item>
+<!-- <el-form-item label="报工单号" prop="workOrder">-->
+<!-- <el-input v-model="form.workOrder" placeholder="请输入报工单号" />-->
+<!-- </el-form-item>-->
<el-form-item label="工厂编码" prop="factoryCode">
<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
</el-form-item>
- <el-form-item label="生产工单号" prop="productOrder">
+ <el-form-item label="生产工单" prop="productOrder">
<el-input v-model="form.productOrder" placeholder="请输入生产工单号" />
</el-form-item>
+ <el-form-item label="生产批次" prop="batchNumber">
+ <el-input v-model="form.batchNumber" placeholder="请输入生产工单号" />
+ </el-form-item>
+ <el-form-item label="入库批次" prop="attr4">
+ <el-input v-model="form.attr4" placeholder="请输入生产工单号" />
+ </el-form-item>
<el-form-item label="仓库编码" prop="whCode">
<el-input v-model="form.whCode" placeholder="请输入仓库编码" />
</el-form-item>
- <el-form-item label="库区编码" prop="waCode">
- <el-input v-model="form.waCode" placeholder="请输入库区编码" />
- </el-form-item>
- <el-form-item label="库位编码" prop="wlCode">
- <el-input v-model="form.wlCode" placeholder="请输入库位编码" />
- </el-form-item>
+<!-- <el-form-item label="库区编码" prop="waCode">-->
+<!-- <el-input v-model="form.waCode" placeholder="请输入库区编码" />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="库位编码" prop="wlCode">-->
+<!-- <el-input v-model="form.wlCode" placeholder="请输入库位编码" />-->
+<!-- </el-form-item>-->
<el-form-item label="产品名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入产品名称" />
</el-form-item>
<el-form-item label="产品编码" prop="productCode">
<el-input v-model="form.productCode" placeholder="请输入产品编码" />
</el-form-item>
- <el-form-item label="产品分类" prop="productSort">
- <el-input v-model="form.productSort" placeholder="请输入产品分类" />
- </el-form-item>
- <el-form-item label="规格型号" prop="specification">
- <el-input v-model="form.specification" placeholder="请输入规格型号" />
- </el-form-item>
+
+<!-- <el-form-item label="产品分类" prop="productSort">-->
+<!-- <el-input v-model="form.productSort" placeholder="请输入产品分类" />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="规格型号" prop="specification">-->
+<!-- <el-input v-model="form.specification" placeholder="请输入规格型号" />-->
+<!-- </el-form-item>-->
<el-form-item label="单位" prop="unitOfMeasure">
<el-input v-model="form.unitOfMeasure" placeholder="请输入单位" />
</el-form-item>
@@ -598,7 +616,7 @@ export default {
this.open = true;
this.title = "添加成品生产入库";
},
- /** 修改按钮操作 */
+ /** 过账按钮操作 */
handleUpdate(row) {
const ids = row.id || this.ids;
let postData = this.ids.map(id => ({ id: id }));
@@ -610,6 +628,16 @@ export default {
this.$modal.msgSuccess("过账完成");
}).catch(() => {});
},
+ /** 修改按钮操作 */
+ handleUpdateKEN(row) {
+ this.reset();
+ const ID = row.ID || this.ids
+ getPut(ID).then(response => {
+ this.form = response.data;
+ this.open = true;
+ this.title = "修改";
+ });
+ },
formatProductCode(code) {
// 检查是否有效，去掉前7个零
if (!code) return code; // 处理 null 或 undefined 情况
diff --git a/src/views/wms/sellout/index.vue b/src/views/wms/sellout/index.vue
index 600a833a..4a218cfb 100644
--- a/src/views/wms/sellout/index.vue
+++ b/src/views/wms/sellout/index.vue
@@ -95,8 +95,13 @@
<el-table-column label="库区编码" align="center" prop="waCode" v-if="false" />
<el-table-column label="库位编码" align="center" prop="wlCode" v-if="false" />
<el-table-column label="出库地点" align="center" prop="deliveryPlace" v-if="false" />
- <el-table-column label="产品名称" align="center" prop="productName"/>
- <el-table-column label="产品编码" align="center" prop="productCode"/>
+ <el-table-column label="产品名称" align="center" prop="productName" width="250"/>
+
+ <el-table-column label="产品编码" align="center" prop="productCode" width="250">
+ <template slot-scope="scope">
+ <span>{{ formatProductCode(scope.row.productCode) }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="产品分类" align="center" prop="productSort" v-if="false" />
<el-table-column label="规格型号" align="center" prop="specification" v-if="false" />
<el-table-column label="单位" align="center" prop="unitOfMeasure"/>
@@ -415,6 +420,11 @@
this.open = true;
this.title = "添加成品销售出库";
},
+ formatProductCode(code) {
+ // 检查是否有效，去掉前7个零
+ if (!code) return code; // 处理 null 或 undefined 情况
+ return code.replace(/^0{1,7}/, ''); // 替换前1到7个0
+ },
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
diff --git a/src/views/wms/wmsRawOrderInSn/index.vue b/src/views/wms/wmsRawOrderInSn/index.vue
index d971756c..b8292813 100644
--- a/src/views/wms/wmsRawOrderInSn/index.vue
+++ b/src/views/wms/wmsRawOrderInSn/index.vue
@@ -236,6 +236,7 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
+
</div>
</template>
@@ -244,6 +245,7 @@ import { listWmsRawOrderInSn, getWmsRawOrderInSn, delWmsRawOrderInSn, addWmsRawO
export default {
name: "WmsRawOrderInSn",
+
data() {
return {
// 遮罩层
@@ -376,6 +378,7 @@ export default {
this.open = true;
this.title = "添加原材料收货明细";
},
+
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();