From 612c77e7b76e803b7604e260c41f8843694315b1 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 27 三月 2026 15:55:47 +0800
Subject: [PATCH] 军泰伟业 1.已发货数量等于总数量时，状态为已发货。已发货数量小于总数量时，状态建议新增发货中 2.产品清除工艺路线点击确定后，仍然回显绑定的工艺路线
---
src/views/productionManagement/productionReporting/index.vue | 58 ++++++++++------------------------------------------------
1 files changed, 10 insertions(+), 48 deletions(-)
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index f4137af..9de948e 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -19,21 +19,6 @@
style="width: 200px;"
@change="handleQuery" />
</el-form-item>
- <el-form-item label="宸ュ崟鐘舵��:">
- <el-select v-model="searchForm.workOrderStatus"
- placeholder="璇烽�夋嫨宸ュ崟鐘舵��"
- style="width: 140px"
- clearable>
- <el-option label="寰呯‘璁�"
- :value="1"></el-option>
- <el-option label="寰呯敓浜�"
- :value="2"></el-option>
- <el-option label="鐢熶骇涓�"
- :value="3"></el-option>
- <el-option label="宸茬敓浜�"
- :value="4"></el-option>
- </el-select>
- </el-form-item>
<el-form-item>
<el-button type="primary"
@click="handleQuery">鎼滅储</el-button>
@@ -136,9 +121,6 @@
</div>
<form-dia ref="formDia"
@close="handleQuery"></form-dia>
- <input-modal v-if="isShowInput"
- v-model:visible="isShowInput"
- :production-product-main-id="isShowingId" />
</div>
</template>
@@ -153,7 +135,7 @@
} from "@/api/productionManagement/productionReporting.js";
import { productionProductMainListPage } from "@/api/productionManagement/productionProductMain.js";
import { userListNoPageByTenantId } from "@/api/system/user.js";
- import InputModal from "@/views/productionManagement/productionReporting/Input.vue";
+
const data = reactive({
searchForm: {
@@ -183,30 +165,25 @@
width: 120,
},
{
- label: "閿�鍞悎鍚屽彿",
- prop: "salesContractNo",
- width: 120,
- },
- {
label: "浜у搧鍚嶇О",
prop: "productName",
width: 120,
},
{
- label: "浜у搧瑙勬牸鍨嬪彿",
+ label: "浜у搧鍥剧焊缂栧彿",
prop: "productModelName",
- width: 120,
+ width: 160,
},
{
label: "浜у嚭鏁伴噺",
prop: "quantity",
width: 120,
},
- // {
- // label: "鎶ュ簾鏁伴噺",
- // prop: "scrapQuantity",
- // width: 120,
- // },
+ {
+ label: "鎶ュ簾鏁伴噺",
+ prop: "scrapQty",
+ width: 120,
+ },
{
label: "鍗曚綅",
prop: "unit",
@@ -216,7 +193,7 @@
{
label: "鍒涘缓鏃堕棿",
prop: "createTime",
- width: 120,
+ width: 180,
},
{
dataType: "action",
@@ -224,13 +201,6 @@
align: "center",
fixed: "right",
operation: [
- {
- name: "鏌ョ湅鎶曞叆",
- type: "text",
- clickFun: row => {
- showInput(row);
- },
- },
{
name: "鍒犻櫎",
type: "danger",
@@ -400,14 +370,6 @@
});
};
- // 鎵撳紑鎶曞叆妯℃�佹
- const isShowInput = ref(false);
- const isShowingId = ref(0);
- const showInput = row => {
- isShowInput.value = true;
- isShowingId.value = row.id;
- };
-
// 瀵煎嚭
const handleOut = () => {
ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
@@ -416,7 +378,7 @@
type: "warning",
})
.then(() => {
- proxy.download("/salesLedger/work/export", {}, "鐢熶骇鎶ュ伐.xlsx");
+ proxy.download("/productionProductMain/export", {}, "鐢熶骇鎶ュ伐.xlsx");
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
--
Gitblit v1.9.3