From 9acb94a83fdb65678c08b25a310fe41af6f8fca2 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期三, 03 十二月 2025 13:50:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue | 2
src/views/sell/XsSeOutStockBackBillList.vue | 4
src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue | 14 ++--
src/views/sell/XsSeOutStockBackBillEdit.vue | 2
src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue | 7 +-
src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue | 8 +-
.env.development | 4
src/views/sell/sellOut/sellOutBill.vue | 32 +++++++---
src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue | 24 ++++----
src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue | 3
.env.production | 4
src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue | 3
src/views/sell/xsSeOrderBill/xsSeOrderBill.vue | 13 +--
src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue | 2
src/views/ProductInBill/Kf_ProductInBillEdit.vue | 12 ++--
15 files changed, 73 insertions(+), 61 deletions(-)
diff --git a/.env.development b/.env.development
index ae352ff..f18817d 100644
--- a/.env.development
+++ b/.env.development
@@ -5,8 +5,8 @@
ENV = 'development'
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/寮�鍙戠幆澧�
-VUE_APP_BASE_API = 'http://localhost:81/API/'
+# VUE_APP_BASE_API = 'http://localhost:81/API/'
# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
-# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
+VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# 璺敱鎳掑姞杞�
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.production b/.env.production
index 74cf4c4..800df2a 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
ENV = 'production'
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/鐢熶骇鐜
-VUE_APP_BASE_API = 'http://47.96.97.237/API/'
-# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
+# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
+VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# 璺敱鎳掑姞杞�
VUE_CLI_BABEL_TRANSPILE_MODULES = true
\ No newline at end of file
diff --git a/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue b/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue
index c3225b6..e9d6c9d 100644
--- a/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue
+++ b/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue
@@ -377,7 +377,8 @@
this.getdata()
},
beforeDestroy() {
- this.$destroy()
+ // 涓嬮潰鐨勪唬鐮佷細瀵艰嚧椤甸潰宕╂簝锛屽厛娉ㄩ噴鎺�
+ // this.$destroy()
},
methods: {
//#region 琛ㄥ崟鏁版嵁鍒濆鍖�
diff --git a/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue b/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
index e77308f..77c3b85 100644
--- a/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
+++ b/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
@@ -8,7 +8,7 @@
</el-select>
</el-form-item>
<el-form-item label="寮�濮嬫棩鏈�">
- <el-date-picker v-model="query.HBeginDate" type="date" placeholder="寮�濮嬫棩鏈�" style="width:160px" :disabled="timeCycleDisabled" value-formate="yyyy-mm-dd" format="yyyy-mm-dd"/>
+ <el-date-picker v-model="query.HBeginDate" type="date" placeholder="寮�濮嬫棩鏈�" style="width:160px" :disabled="timeCycleDisabled" value-formate="yyyy-MM-dd" format="yyyy-MM-dd"/>
</el-form-item>
<el-form-item label="缁撴潫鏃ユ湡">
<el-date-picker v-model="query.HEndDate" type="date" placeholder="缁撴潫鏃ユ湡" style="width:160px" :disabled="timeCycleDisabled" value-format="yyyy-MM-dd" format="yyyy-MM-dd"/>
@@ -220,6 +220,7 @@
//import FbStepFoldinBillEdit from './fbStepFoldinBillEdit'
import FbStepFoldinBillEdit from '@/views/FbStepFoldOutBillList/fbStepFoldOutBillListEdit'
import BarCodeDetail from '@/views/component/BarCodeDetail'
+import dayjs from 'dayjs';
export default {
@@ -322,6 +323,7 @@
const yyyy = d.getFullYear();
const mm = String(d.getMonth() + 1).padStart(2, '0');
const dd = String(d.getDate()).padStart(2, '0');
+
return `${yyyy}-${mm}-${dd}`;
},
onTimeCycleChange() {
@@ -392,8 +394,8 @@
if (q.ColName2 && q.Comparator2 && q.Comparator2 !== '0' && q.ColContent2)
sWhereParts.push(buildComparator(q.ColName2, q.Comparator2, q.ColContent2));
- if (q.HBeginDate) sWhereParts.push(` and CONVERT(varchar(100),鏃ユ湡, 23) >= '${q.HBeginDate}'`);
- if (q.HEndDate) sWhereParts.push(` and CONVERT(varchar(100),鏃ユ湡, 23) <= '${q.HEndDate}'`);
+ if (q.HBeginDate) sWhereParts.push(` and CONVERT(varchar(100),鏃ユ湡, 23) >= '${dayjs(q.HBeginDate).format("YYYY-MM-DD")}'`);
+ if (q.HEndDate) sWhereParts.push(` and CONVERT(varchar(100),鏃ユ湡, 23) <= '${dayjs(q.HEndDate).format("YYYY-MM-DD")}'`);
if (q.HBillNo) sWhereParts.push(` and 鍗曟嵁鍙� like '%${q.HBillNo}%'`);
if (q.HDeptID) sWhereParts.push(` and 閮ㄩ棬 like '%${q.HDeptID}%'`);
if (q.MaterialCode) sWhereParts.push(` and 鐗╂枡浠ｇ爜 like '%${q.MaterialCode}%'`);
diff --git a/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue
index 466d0e0..5df9bfa 100644
--- a/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue
+++ b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue
@@ -505,7 +505,8 @@
this.getdata()
},
beforeDestroy() {
- this.$destroy()
+ // 浼氬鑷撮〉闈㈠穿婧� 鍏堟敞閲婃帀
+ // this.$destroy()
},
methods: {
//#region 琛ㄥ崟鏁版嵁鍒濆鍖�
diff --git a/src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue b/src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue
index c881c1e..fa92ca9 100644
--- a/src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue
+++ b/src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue
@@ -175,7 +175,7 @@
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" label="搴忓彿" type="index" width="80" />
- <el-table-column align="center" label="婧愬崟鍗曞彿" width="120">
+ <!-- <el-table-column align="center" label="婧愬崟鍗曞彿" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HSourceBillNo }}</span>
</template>
@@ -194,7 +194,7 @@
<template slot-scope="scope">
<span>{{ scope.row.HSourceEntryID }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column align="center" label="HMaterID" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HMaterID }}</span>
@@ -426,7 +426,8 @@
this.getdata()
},
beforeDestroy() {
- this.$destroy()
+
+ // this.$destroy()
},
methods: {
//#region 琛ㄥ崟鏁版嵁鍒濆鍖�
diff --git a/src/views/ProductInBill/Kf_ProductInBillEdit.vue b/src/views/ProductInBill/Kf_ProductInBillEdit.vue
index 61a9e70..d5dd6e9 100644
--- a/src/views/ProductInBill/Kf_ProductInBillEdit.vue
+++ b/src/views/ProductInBill/Kf_ProductInBillEdit.vue
@@ -164,7 +164,7 @@
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" label="搴忓彿" type="index" width="80" />
- <el-table-column align="center" label="婧愬崟鍗曞彿" width="120">
+ <!-- <el-table-column align="center" label="婧愬崟鍗曞彿" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HSourceBillNo }}</span>
</template>
@@ -183,7 +183,7 @@
<template slot-scope="scope">
<span>{{ scope.row.HSourceEntryID }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column align="center" label="HMaterID" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HMaterID }}</span>
@@ -770,10 +770,10 @@
HSalePrice: 0,
HSeOrderInterID: 741,
HSeOrderEntryID: 18,
- HSeOrderBillNo: 'XSFH00000747',
- HSourceInterID: 741,
- HSourceEntryID: 18,
- HSourceBillNo: 'XSFH00000747',
+ HSeOrderBillNo: '',
+ HSourceInterID: 0,
+ HSourceEntryID: 0,
+ HSourceBillNo: '',
HSourceBillType: 1402,
HRelationQty: 0,
HRelationMoney: 0,
diff --git a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue
index 7e2ff79..fef7788 100644
--- a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue
+++ b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue
@@ -247,12 +247,12 @@
<span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
</template>
</el-table-column>
- <el-table-column align="center" label="搴旀敹鏁伴噺" width="120">
+ <el-table-column align="center" label="搴旈��鏁伴噺" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HQtyMust }}</span>
</template>
</el-table-column>
- <el-table-column align="center" label="瀹炴敹鏁伴噺" width="120">
+ <el-table-column align="center" label="瀹為��鏁伴噺" width="120">
<template slot-scope="scope">
<el-input-number v-model="scope.row.HQty" :min="0" style="width: 90px;"
controls-position="right"></el-input-number>
@@ -515,7 +515,7 @@
, "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
, "HUnitID": dataArray[i].HUnitID
, "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQtyMust": dataArray[i].鏁伴噺.toFixed(6)
+ , "HQtyMust": dataArray[i].搴斿彂鏁伴噺.toFixed(6)
, "HQty": dataArray[i].鏁伴噺.toFixed(6)
, "HPieceQty": "0"
, "HPrice": dataArray[i].鍗曚环.toFixed(4)
@@ -737,8 +737,8 @@
, "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
, "HUnitID": result.data[i].HUnitID
, "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅
- , "HQtyMust": result.data[i].搴旀敹鏁伴噺
- , "HQty": result.data[i].瀹炴敹鏁伴噺
+ , "HQtyMust": result.data[i].搴斿彂鏁伴噺
+ , "HQty": result.data[i].鏁伴噺
, "HRemark": result.data[i].琛ㄤ綋澶囨敞
, "HPrice": result.data[i].鍗曚环
, "HMoney": result.data[i].閲戦
@@ -853,8 +853,8 @@
"瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿,
"HUnitID": result.data[i].HUnitID,
"璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅,
- "HQtyMust": result.data[i].搴旀敹鏁伴噺,
- "HQty": result.data[i].瀹炴敹鏁伴噺,
+ "HQtyMust": result.data[i].搴斿彂鏁伴噺,
+ "HQty": result.data[i].鏁伴噺,
"HRemark": (result.data[i].琛ㄤ綋澶囨敞 || "") + " (澶嶅埗)",
"HPrice": result.data[i].鍗曚环,
"HMoney": result.data[i].閲戦,
diff --git a/src/views/sell/XsSeOutStockBackBillEdit.vue b/src/views/sell/XsSeOutStockBackBillEdit.vue
index a4cd46e..227d91a 100644
--- a/src/views/sell/XsSeOutStockBackBillEdit.vue
+++ b/src/views/sell/XsSeOutStockBackBillEdit.vue
@@ -320,7 +320,7 @@
</el-table-column>
<el-table-column align="center" label="鍙戣揣浠撳簱" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
+ <span>{{ scope.row.鍙戣揣浠撳簱 }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="鏀惰揣浠撳簱" width="120">
diff --git a/src/views/sell/XsSeOutStockBackBillList.vue b/src/views/sell/XsSeOutStockBackBillList.vue
index ce7bc39..6b49044 100644
--- a/src/views/sell/XsSeOutStockBackBillList.vue
+++ b/src/views/sell/XsSeOutStockBackBillList.vue
@@ -1403,7 +1403,7 @@
//鎵撳紑鏂板缁勪欢寮圭獥
handleAddEdit() {
this.rowForm.HItemID = 0;
- this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=${0}&OperationType=${1}©Type=${-1}`;
+ this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=0&OperationType=1&CopyType=2`;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
@@ -1411,7 +1411,7 @@
},
//鎵撳紑淇敼缁勪欢寮圭獥
handleEdit(row, OperationType, copyType) {
- this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=${row.hmainid}&OperationType=${OperationType}©Type=${copyType}`;
+ this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=${row.hmainid}&OperationType=${OperationType}&CopyType=${copyType}`;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
diff --git a/src/views/sell/sellOut/sellOutBill.vue b/src/views/sell/sellOut/sellOutBill.vue
index e97661f..76c20e4 100644
--- a/src/views/sell/sellOut/sellOutBill.vue
+++ b/src/views/sell/sellOut/sellOutBill.vue
@@ -305,7 +305,14 @@
>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single" @click="get_BarCodeDetail">鏉＄爜鏄庣粏</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-printer"
+ size="mini"
+ :disabled="single"
+ @click="get_BarCodeDetail"
+ >鏉＄爜鏄庣粏</el-button
+ >
</el-col>
</el-row>
<div class="tableBox" v-loading="loading">
@@ -416,7 +423,7 @@
<!-- <div>111</div> -->
</el-dialog>
<!-- 鏉＄爜鏄庣粏 -->
- <BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail"/>
+ <BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail" />
</div>
</div>
</template>
@@ -426,12 +433,12 @@
import RowSettings from "@/views/component/rowSettings";
import Edit from "@/views/sell/sellOut/sellOutBillEdit";
import PrintList from "@/views/component/printList";
-import BarCodeDetail from '@/views/component/BarCodeDetail' //鏉＄爜鏄庣粏缁勪欢
+import BarCodeDetail from "@/views/component/BarCodeDetail"; //鏉＄爜鏄庣粏缁勪欢
import moment from "moment";
export default {
name: "SellOutBill",
- components: { RowSettings, Edit, PrintList,BarCodeDetail },
+ components: { RowSettings, Edit, PrintList, BarCodeDetail },
data() {
return {
activeSeach: "",
@@ -441,7 +448,7 @@
tableShow: true,
openPrintList: false,
printListShow: false,
- barCodeDetailShow: false, //鏉＄爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
+ barCodeDetailShow: false, //鏉＄爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
openBtnHide: false,
btnHideShow: false,
rowHideShow: false,
@@ -1055,6 +1062,7 @@
.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
.then(() => {
if (this.rowForm.鐘舵�� == "鍒涘缓") {
+ this.loading = true;
axios
.get(this.baseURL + "/Kf_SellOutBill/DeltetSellOutBill", {
params: {
@@ -1065,13 +1073,16 @@
.then((response) => {
if (response.data.count == 1) {
this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ this.$modal.msgSuccess(response.data.Message);
} else {
this.$modal.msgError("閿欒:" + result.code + result.Message);
}
})
.catch((error) => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ })
+ .finally(() => {
+ this.loading = false;
});
} else {
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
@@ -1144,13 +1155,12 @@
// this.$message.warning('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬫潯鐮佹槑缁嗭紒')
// return
// }
- this.barCodeDetailShow = true
+ this.barCodeDetailShow = true;
this.$nextTick(() => {
- this.$refs.barcodeDetail.open(this.rowForm)
- })
- },
+ this.$refs.barcodeDetail.open(this.rowForm);
+ });
+ },
//#endregion
-
//#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
defaintOperationByCompanyName() {
diff --git a/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue b/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
index 5bc7ae0..8f412b5 100644
--- a/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
+++ b/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
@@ -683,7 +683,7 @@
openData: false, //鏁版嵁寮圭獥
dialogTitle: "",
zuzhiId: "",
- organizationList: [], //缁勭粐鍒楄〃
+ organizationList: JSON.parse(sessionStorage["organizationList"]), //缁勭粐鍒楄〃
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
@@ -1390,7 +1390,8 @@
},
//鎵撳紑鏂板缁勪欢寮圭獥
handleAddEdit() {
- this.rowForm.HItemID = 0;
+ // this.rowForm.HItemID = 0;
+ this.iframeUrl = `/iframe/XsSeOrderBillEdit?HInterID=0&OperationType=1©Type=-1`;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
@@ -1417,13 +1418,9 @@
.then(() => {
if (!this.rowForm.瀹℃牳浜�) {
axios
- .get(this.baseURL + "Cg_POInStockBill/DeltetPOInStockBill", {
+ .get(this.baseURL + "Xs_SeOrderBill/DropXs_SeOrderBill", {
params: {
- HInter: this.rowForm.hmainid.toString(),
- HsupId: this.rowForm.HsupId,
- HQty: this.rowForm.HQty,
- HSourceInterID: this.rowForm.HSourceInterID,
- HSourceEntryID: this.rowForm.HSourceEntryID,
+ HInterID: this.rowForm.hmainid.toString(),
user: sessionStorage["HUserName"],
},
})
diff --git a/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue b/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue
index 904eeec..bff4cbb 100644
--- a/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue
+++ b/src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue
@@ -435,18 +435,18 @@
</el-table-column>
<el-table-column align="center" label="浠撳簱" width="120">
<template slot-scope="scope">
- <el-input-number
- v-model="scope.row.HQty"
+ <el-input
+ v-model="scope.row.浠撳簱"
:min="1"
style="width: 90px"
controls-position="right"
- ></el-input-number>
+ ></el-input>
</template>
</el-table-column>
<el-table-column align="center" label="鏁伴噺2" width="120">
<template slot-scope="scope">
<el-input-number
- v-model="scope.row.HPrice"
+ v-model="scope.row.HQty"
:min="0"
style="width: 90px"
controls-position="right"
@@ -455,22 +455,22 @@
</el-table-column>
<el-table-column align="center" label="鍗曚环" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.HTaxPrice }}</span>
+ <span>{{ scope.row.HPrice }}</span>
</template>
</el-table-column>
- <el-table-column align="center" label="鍔犵◣鍚堣" width="120">
+ <el-table-column align="center" label="浠风◣鍚堣" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.HTaxRate }}</span>
+ <span>{{ scope.row.HTaxMoney }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="瀹㈡埛瑙勬牸鍨嬪彿" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.HPrice * scope.row.HQty }}</span>
+ <span>{{ scope.row.HPrice * scope.row.瑙勬牸鍨嬪彿 }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="浜よ揣鏃ユ湡" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.HTaxPrice * scope.row.HQty }}</span>
+ <span>{{ scope.row.HTaxPrice * scope.row.HDate }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="澶囨敞" width="120">
@@ -648,8 +648,8 @@
getdata() {
this.HInterID2 = this.$route.query.HInterID || this.linterid || 0;
this.OperationType2 = this.$route.query.OperationType || this.OperationType || 1;
- this.CopyType2 = this.$route.query.copyType || this.copyType || -1;
- console.log(this.CopyType2, this.OperationType2, this.HInterID2);
+ this.CopyType2 = this.$route.query.CopyType || this.copyType || -1;
+ console.log("浼犻�掔殑鍙傛暟",this.$route.query.CopyType,this.$route.query.OperationType, this.$route.query.HInterID);
this.formShow = false;
this.formLoading = true;
@@ -712,7 +712,7 @@
HMoney: dataArray[i].閲戦.toFixed(2),
HTaxMoney: dataArray[i].浠风◣鍚堣.toFixed(2),
HWHID: dataArray[i].HWHID,
- 鍙戣揣浠撳簱: dataArray[i].HWHName,
+ 浠撳簱: dataArray[i].HWHName,
HRemark: "",
HQty_Full: "0",
HQty_Empty: "0",
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
index cf3437d..0a80611 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
@@ -23,7 +23,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="宸ュ巶浠ｇ爜" prop="HWorksNumber">
- <el-select v-model="form.HWorksNumber" placeholder="璇烽�夋嫨缁勭粐" style="width: 100%">
+ <el-select v-model="form.HWorksNumber" placeholder="璇烽�夋嫨宸ュ巶" style="width: 100%">
<el-option v-for="(item, index) in HWorksNumberList" :key="index" :label="item"
:value="item">
</el-option>
diff --git a/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue b/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
index 01e6047..984378d 100644
--- a/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
+++ b/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
@@ -484,7 +484,7 @@
this.warehouseShow = false
this.openData = false
} else if (num == 3){
- console.log(deptRow)
+
this.editData[this.zbIndex].HMaterID = deptRow.HItemID
this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜
this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О
--
Gitblit v1.9.1