From b63d096b24ad28ce7c9f4dfc7112046a4f854be7 Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期一, 30 三月 2026 21:35:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
index 5b94043..6c4c68e 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
@@ -40,8 +40,8 @@
<el-form-item label="閮ㄩ棬淇℃伅" prop="HDept">
<el-input v-model="queryParams.HDept" placeholder="璇疯緭鍏ラ儴闂ㄤ俊鎭�" @keyup.enter.native="handleQuery" />
</el-form-item>
- <el-form-item label="鍣ㄥ叿浠ｇ爜" prop="HModelNumber">
- <el-input v-model="queryParams.HModelNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�" @keyup.enter.native="handleQuery" />
+ <el-form-item label="瀹瑰櫒浠ｇ爜" prop="HModelNumber">
+ <el-input v-model="queryParams.HModelNumber" placeholder="璇疯緭鍏ュ鍣ㄤ唬鐮�" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
<el-input v-model="queryParams.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" @keyup.enter.native="handleQuery" />
@@ -137,7 +137,7 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-tickets" size="mini"
- @click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堝櫒鍏风洿鎺ヨ皟鎷ㄥ崟锛�</el-button>
+ @click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堝鍣ㄧ洿鎺ヨ皟鎷ㄥ崟锛�</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
@@ -149,7 +149,7 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CheckBill(2, form = rowForm)">杩斿鏍�</el-button>
+ @click="set_CheckBill(2, form = rowForm)">鍙嶅鏍�</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
@@ -174,7 +174,7 @@
<template slot-scope="{row, column }">
<el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
<div :style="item.style">
- <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
+ <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
<el-button type="text" @click="handleEdit(row, OperationType = 2)"
v-else-if="column.property == '鍗曟嵁鍙�'">{{row.鍗曟嵁鍙穧}</el-button>
<span v-else>{{ row[column.label] }}</span>
@@ -189,12 +189,12 @@
v-if="rowHideShow" />
</el-dialog>
<!-- 缂栬緫 -->
- <el-dialog title="缂栬緫鍣ㄥ叿璋冩嫧鐢宠鍗�" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
+ <el-dialog title="缂栬緫瀹瑰櫒璋冩嫧鐢宠鍗�" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
<edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
:copyType="copyType" @editClose="editClose" v-if="editShow" />
</el-dialog>
<!-- 涓嬫帹 -->
- <el-dialog title="涓嬫帹鍣ㄥ叿鐩存帴璋冩嫧鍗�" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
+ <el-dialog title="涓嬫帹瀹瑰櫒鐩存帴璋冩嫧鍗�" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
<push :OperationType='4' :propsData='pushData' :HSouceBillType=BillType
@editClose="pushClose" v-if="pushShow" />
</el-dialog>
@@ -403,7 +403,7 @@
this.pageSize = 50
}
// 鍒楄〃
- axios.get(this.baseURL + '/Sc_MouldMoveStockRequestBillController/page', {
+ axios.get(this.$baseUrl + '/Sc_MouldMoveStockRequestBillController/page', {
params: {
"sWhere": this.sWhere,
"user": sessionStorage["HUserName"],
@@ -447,6 +447,8 @@
option.data = data1.data
this.dataList = option
this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
+ }else{
+ this.$modal.msgError(response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
@@ -454,7 +456,7 @@
},
DisPlay_HideColumn(HModName, user, option, dataOption) {
this.totalNameList = []
- axios.get(this.baseURL + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
+ axios.get(this.$baseUrl + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
params: {
"HModName": HModName,
"user": user,
@@ -843,14 +845,14 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- axios.get(this.baseURL + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Delete_Json", {
+ axios.get(this.$baseUrl + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Delete_Json", {
params: { 'HInterID': this.rowForm.hmainid.toString(), 'HMaker': sessionStorage["HUserName"] }
}).then(response => {
if (response.data.count == 1) {
this.getList()
this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
} else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
+ this.$modal.msgError("閿欒:" + response.data.code + response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
@@ -861,7 +863,7 @@
set_CheckBill(num, form) {
var InterID = form.hmainid || form.HInterID
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.baseURL + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Check_Json", {
+ axios.get(this.$baseUrl + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Check_Json", {
params: { "HInterID": InterID, "Type": num, "HMaker": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
@@ -891,7 +893,7 @@
} else if (this.rowForm.鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
} else {
- axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
+ axios.get(this.$baseUrl + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
params: { "HInterID": this.rowForm.hmainid }
}).then(response => {
var result = response.data
--
Gitblit v1.9.1