From 5f292066465e6f20d4ac7b3d151bcfad281c16b8 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 17 十二月 2025 14:22:51 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue | 90 ++++++++++-------
src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue | 162 +++++++++++++++++++++----------
.env.development | 8
src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue | 22 ----
4 files changed, 169 insertions(+), 113 deletions(-)
diff --git a/.env.development b/.env.development
index 1458729..31cc83e 100644
--- a/.env.development
+++ b/.env.development
@@ -5,9 +5,9 @@
ENV = 'development'
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/寮�鍙戠幆澧�
-# VUE_APP_BASE_API = http://localhost:81/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://localhost:8082/LuBaoAPI/
+# 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://localhost:8082/LuBaoAPI/'
# 璺敱鎳掑姞杞�
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
index bead72d..e05983a 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
@@ -51,7 +51,8 @@
<el-col :span="6">
<el-form-item label="閫夊崟鍙�" prop="HSourceBillNo">
<el-input v-model="form.HSourceBillNo" placeholder="璇疯緭鍏ラ�夊崟鍙�" disabled>
- <el-button class="input-search-btn" slot="append" icon="el-icon-search" @click="openDataDialog(null)"></el-button>
+ <el-button class="input-search-btn" slot="append" icon="el-icon-search"
+ @click="openDataDialog(null)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -83,7 +84,11 @@
</el-table-column>
<el-table-column align="center" label="鐗╂枡浠ｇ爜" prop="HMaterNumber" width="120"
show-overflow-tooltip>
- <template slot-scope="scope"><el-input v-model="scope.row.HMaterNumber" /></template>
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HMaterNumber"
+ @keyup.native.f7="openDataDialog(3, scope.row)"
+ @dblclick.native="openDataDialog(3, scope.row)" />
+ </template>
</el-table-column>
<el-table-column align="center" label="鐗╂枡鍚嶇О" prop="HMaterName" width="120"
show-overflow-tooltip>
@@ -93,7 +98,7 @@
show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.HMaterModel }}</template>
</el-table-column>
-
+
<el-table-column align="center" label="鏁伴噺" prop="HQty" width="120" show-overflow-tooltip>
<template slot-scope="scope">
<el-input-number v-model="scope.row.HQty" :min="0" controls-position="right"
@@ -189,9 +194,9 @@
<el-table-column align="center" label="杈呭姪灞炴�т唬鐮�" prop="HAuxPropNumber" width="120"
show-overflow-tooltip>
<template slot-scope="scope">
- <el-input v-model="scope.row.HAuxPropNumber"
- @keyup.native.f7="openDataDialog(1, scope.row)"
- @dblclick.native="openDataDialog(1, scope.row)" />
+ <el-input v-model="scope.row.HAuxPropNumber"
+ @keyup.native.f7="openDataDialog(1, scope.row)"
+ @dblclick.native="openDataDialog(1, scope.row)" />
</template>
</el-table-column>
<el-table-column align="center" label="杈呭姪灞炴�у悕绉�" prop="HAuxPropName" width="120"
@@ -231,7 +236,8 @@
</el-tab-pane>
<el-tab-pane label="鏉＄爜淇℃伅" name="tiaoma">
<el-table :data="editTmData" style="width: 100%" height="480" width="100%" ref="tbzbTable"
- @selection-change="handleTableWlxxZbEdit" :row-class-name="tiaomaZbIndex" border v-if="editTmData.length>0">
+ @selection-change="handleTableWlxxZbEdit" :row-class-name="tiaomaZbIndex" border
+ v-if="editTmData.length > 0">
<el-table-column align="center" label="搴忓彿" type="index" width="80" fixed />
<template v-for="(item, index) in tmBtList">
<el-table-column align="center" :prop="item.field" :label="item.title" :width="item.width"
@@ -241,7 +247,8 @@
</el-tab-pane>
<el-tab-pane label="妗ｆ鍒楄〃" name="dangan">
<el-table :data="editDaData" style="width: 100%" height="480" width="100%" ref="dazbTable"
- @selection-change="handleTableDangan" :row-class-name="danganZbIndex" border v-if="editDaData.length>0">
+ @selection-change="handleTableDangan" :row-class-name="danganZbIndex" border
+ v-if="editDaData.length > 0">
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" label="搴忓彿" type="index" width="80" fixed />
<template v-for="(item, index) in daBtList">
@@ -260,20 +267,15 @@
<el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body @close="closeBill">
<HSourceReportHtml @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName"
:HOrgID='this.form.HOrgID' :HSouceBillType="HSouceBillType" v-if="ScICMOBillShow" />
-
- <GyProperty
- @deptEmitDb="dbEmitData"
- @deptEmit="emitData"
- :openPage="HModName"
- v-if="propertyShow"
- />
+ <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="materialShow" />
+ <GyProperty @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="propertyShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
</div>
</el-dialog>
<el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
- <PrintList :linterid="rowSel.toString()" :MyMsg="rowSel.toString()" Type="HGy_BarCodeBill"
+ <PrintList :linterid="rowSel.toString()" :MyMsg="rowSel.toString()" Type="HGy_BarCodeBill"
HModName="HGy_BarCodeBill" @rowEditClose="rowSetClose" v-if="printListShow" />
<!-- <div>111</div> -->
</el-dialog>
@@ -285,10 +287,11 @@
import PrintList from "@/views/component/printList";
import moment from 'moment';
import GyProperty from "@/views/basic/gyProperty/gyPropertyList.vue";
+import Material from '@/views/gyMaterial/GyMaterial.vue'
export default {
name: 'Gy_BarCodeBill',
- components: { HSourceReportHtml, PrintList, GyProperty },
+ components: { HSourceReportHtml, PrintList, GyProperty, Material },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -297,7 +300,7 @@
},
data() {
return {
- rowSel:[],
+ rowSel: [],
HModName: "Gy_BarCodeBill",
danganSelList: [],
openPrintList: false,
@@ -536,8 +539,8 @@
this.getdata()
},
methods: {
- closeBill(){
- this.ScICMOBillShow=false
+ closeBill() {
+ this.ScICMOBillShow = false
},
get_PrintReport() {
if (this.danganSelList.length == 0) {
@@ -545,7 +548,7 @@
} else {
this.rowSel = [];
for (var i = 0; i < this.danganSelList.length; i++) {
- this.rowSel.push(this.danganSelList[i].HItemID.toString());
+ this.rowSel.push(this.danganSelList[i].HItemID.toString());
}
this.printListShow = true;
this.openPrintList = true;
@@ -783,15 +786,24 @@
},
//寮圭獥璧嬪��
dbEmitData(deptRow, num) {
- if(num) {
- if(num == 'gyProperty') {
+ if (num) {
+ if (num == 'gyProperty') {
this.editWlxxData[this.zbIndex].HAuxPropID = deptRow.HItemID;
this.editWlxxData[this.zbIndex]["HAuxPropName"] = deptRow["杈呭姪灞炴�у悕绉�"];
this.editWlxxData[this.zbIndex]["HAuxPropNumber"] = deptRow["杈呭姪灞炴�т唬鐮�"];
this.propertyShow = false;
this.openData = false;
+ } else if (num == 3) {
+ this.editWlxxData[this.zbIndex].HMaterID = deptRow.HItemID;
+ this.editWlxxData[this.zbIndex].HMaterNumber = deptRow.鐗╂枡浠ｇ爜;
+ this.editWlxxData[this.zbIndex].HMaterName = deptRow.鐗╂枡鍚嶇О;
+ this.editWlxxData[this.zbIndex].HMaterModel = deptRow.瑙勬牸鍨嬪彿
+ this.editWlxxData[this.zbIndex].HUnitID = deptRow.HUnitID;
+ this.editWlxxData[this.zbIndex].HUnitName = deptRow.璁￠噺鍗曚綅鍚嶇О
+ this.editWlxxData[this.zbIndex].HUnitNumber = deptRow.璁￠噺鍗曚綅浠ｇ爜
+ this.materialShow = false
+ this.openData = false
}
-
return
}
console.log(deptRow)
@@ -1212,6 +1224,7 @@
this.danganSelList = selection
},
showReset() {
+ this.materialShow = false
this.ScICMOBillShow = false
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
@@ -1220,15 +1233,20 @@
if (row) {
this.zbIndex = row.index - 1
}
- if(num) {
- switch(num) {
- case 1:
- this.dialogTitle = '杈呭姪灞炴�у垪琛�'
- this.propertyShow = true
- this.openData = true
- ;break;
+ if (num) {
+ switch (num) {
+ case 1:
+ this.dialogTitle = '杈呭姪灞炴�у垪琛�'
+ this.propertyShow = true
+ this.openData = true
+ ; break;
+ case 3:
+ this.dialogTitle = '鐗╂枡鍒楄〃'
+ this.materialShow = true
+ this.openData = true
+ break;
}
- }else {
+ } else {
this.showReset()
this.HSouceBillType = this.getSupType()
this.dialogTitle = this.getSupType() + '鍒楄〃'
@@ -1241,8 +1259,8 @@
};
</script>
<style>
- .input-search-btn {
- background-color: rgb(24, 144, 255) !important;
- color: #fff !important;
- }
+.input-search-btn {
+ background-color: rgb(24, 144, 255) !important;
+ color: #fff !important;
+}
</style>
\ No newline at end of file
diff --git a/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue b/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
index 2bcc0ab..7a2d3d4 100644
--- a/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
+++ b/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
@@ -564,7 +564,7 @@
deptform: {}, //寮圭獥閫変腑鏁版嵁
openData: false, //鏁版嵁寮圭獥
dialogTitle: "",
- organizationList: [], //缁勭粐鍒楄〃
+ organizationList: JSON.parse(sessionStorage.getItem('organizationList')), //缁勭粐鍒楄〃
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
HInterID: 0,
@@ -628,27 +628,9 @@
};
},
created() {
- this.fetchData();
- this.getdata();
+ this.getdata()
},
methods: {
- StockInOrgChangeHandler() {
- this.editData.forEach(element => {
- element.HSTOCKORGINID = this.form.HSTOCKINORGID
- });
- },
- fetchData() {
- axios
- .get(this.baseURL + "/Web/GetOrganizations", {})
- .then((response) => {
- if (response.data.count == 1) {
- this.organizationList = response.data.data; //缁勭粐鍒楄〃
- }
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
getdata() {
this.formShow = false;
this.formLoading = true;
diff --git a/src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue b/src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue
index 620b5c0..9454754 100644
--- a/src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue
+++ b/src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue
@@ -40,7 +40,7 @@
</el-form-item>
<el-form-item label="瑙勬牸鍨嬪彿" prop="SpecificationModel">
<el-input v-model="queryParams.SpecificationModel" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
- </el-form-item>
+ </el-form-item>
<el-form-item label="婧愬崟鍗曞彿" prop="HSourceBillNo">
<el-input v-model="queryParams.HSourceBillNo" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
</el-form-item>
@@ -132,10 +132,10 @@
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
@click="handleEdit(row = rowForm, OperationType = 3)">缂栬緫</el-button>
</el-col>
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
@click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</el-button>
- </el-col>
+ </el-col> -->
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
</el-button>
@@ -147,6 +147,22 @@
<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>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="set_CloseBill(0)">鍏抽棴
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="set_CloseBill(1)">鍙嶅叧闂�
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="set_DropBill(1)">浣滃簾
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="set_DropBill(2)">鍙嶄綔搴�
+ </el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
@@ -182,10 +198,10 @@
</el-table-column>
</template>
</el-table>
- <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes" @pagination="getList" />
+ <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes"
+ @pagination="getList" />
<el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
- <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose"
- v-if="rowHideShow" />
+ <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
<!-- 缂栬緫 -->
<el-dialog title="缂栬緫璋冩嫧鐢宠鍗�" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
@@ -193,8 +209,8 @@
:copyType="copyType" @editClose="editClose" v-if="editShow" />
</el-dialog>
<el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
- <PrintList :linterid=this.rowForm.hmainid :MyMsg=this.rowForm.hmainid :Type='HModName'
- :HModName='HModName' @rowEditClose="rowSetClose" v-if="printListShow" />
+ <PrintList :linterid=this.rowForm.hmainid :MyMsg=this.rowForm.hmainid :Type='HModName' :HModName='HModName'
+ @rowEditClose="rowSetClose" v-if="printListShow" />
<!-- <div>111</div> -->
</el-dialog>
</div>
@@ -270,15 +286,15 @@
// 鏌ヨ鍙傛暟
queryParams: {
HBillNo: '',
- HBillno2:'',
+ HBillno2: '',
HInitTimeCycle: 29,
- HDeptID:'',
- MaterialCode:'',
- MaterialName:'',
- SpecificationModel:'',
- HSourceBillNo:'',
- Warehouse:'',
- Hmaker:'',
+ HDeptID: '',
+ MaterialCode: '',
+ MaterialName: '',
+ SpecificationModel: '',
+ HSourceBillNo: '',
+ Warehouse: '',
+ Hmaker: '',
ColName1: '',
ColName2: '',
ColName: '',
@@ -316,7 +332,7 @@
methods: {
//閲嶆柊鍚屾
- set_ResCnz(){
+ set_ResCnz() {
axios.get(this.baseURL + "/Cg_POOrderBill/Resynchronize", {
params: { "HBillNo": '', "HBillType": 1243 }
}).then(response => {
@@ -422,7 +438,7 @@
//鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
var patrn = new RegExp(/^h/i);
if (patrn.test(data1.list[key].ColmCols)) {
- this.titleData[key] = data1.list[key].ColmCols;
+ this.titleData[key] = data1.list[key].ColmCols;
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
@@ -454,15 +470,15 @@
"HModName": HModName,
"user": user,
},
- }).then(res => {
+ }).then(res => {
let data1 = res.data
- if (data1.data.length != 0) {
+ if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
dataCol = data1.data[0].HGridString.split(',');
//鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
- if (dataCol.length == option.cols[0].length - 1) {
+ if (dataCol.length == option.cols[0].length - 1) {
//閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
for (var j = 0; j < option.cols[0].length - 1; j++) {
for (var i = 0; i < option.cols[0].length - 1; i++) {
@@ -688,26 +704,27 @@
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
if (this.queryParams.HDeptID) {
- this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDeptID + "%'";
+ this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDeptID + "%'";
}
if (this.queryParams.MaterialCode) {
- this.sWhere += " and 鐗╂枡浠ｇ爜 like '%" + this.queryParams.MaterialCode + "%'";
+ this.sWhere += " and 鐗╂枡浠ｇ爜 like '%" + this.queryParams.MaterialCode + "%'";
}
if (this.queryParams.MaterialName) {
- this.sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.MaterialName + "%'";
+ this.sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.MaterialName + "%'";
}
if (this.queryParams.SpecificationModel) {
- this.sWhere += " and 瑙勬牸鍨嬪彿 like '%" + this.queryParams.SpecificationModel + "%'";
+ this.sWhere += " and 瑙勬牸鍨嬪彿 like '%" + this.queryParams.SpecificationModel + "%'";
}
if (this.queryParams.HSourceBillNo) {
- this.sWhere += " and 婧愬崟鍗曞彿 like '%" + this.queryParams.HSourceBillNo + "%'";
+ this.sWhere += " and 婧愬崟鍗曞彿 like '%" + this.queryParams.HSourceBillNo + "%'";
}
if (this.queryParams.Warehouse) {
- this.sWhere += " and 浠撳簱鍚嶇О like '%" + this.queryParams.Warehouse + "%'";
+ this.sWhere += " and 浠撳簱鍚嶇О like '%" + this.queryParams.Warehouse + "%'";
}
if (this.queryParams.Hmaker) {
- this.sWhere += " and 鍒跺崟浜� like '%" + this.queryParams.Hmaker + "%'";
+ this.sWhere += " and 鍒跺崟浜� like '%" + this.queryParams.Hmaker + "%'";
}
+ this.clearData()
this.getList()
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
@@ -716,13 +733,13 @@
this.queryParams = {
HBillNo: '',
HInitTimeCycle: 29,
- HDeptID:'',
- MaterialCode:'',
- MaterialName:'',
- SpecificationModel:'',
- HSourceBillNo:'',
- Warehouse:'',
- Hmaker:'',
+ HDeptID: '',
+ MaterialCode: '',
+ MaterialName: '',
+ SpecificationModel: '',
+ HSourceBillNo: '',
+ Warehouse: '',
+ Hmaker: '',
ColName1: '',
ColName2: '',
ColName: '',
@@ -734,16 +751,24 @@
ColContent: '',
}
this.riqiChange()
+ this.clearData()
this.resetForm("queryForm")
this.getList()
},
-
+ clearData() {
+ this.single = true
+ this.multiple = true
+ this.OperationType = 0
+ this.copyType = 0
+ this.ids = []
+ },
//閫�鍑�
close() {
// this.reset()
this.tableShow = true
this.openEdit = false
this.editShow = false
+ this.clearData()
this.getList()
},
//鎵撳紑鏂板缁勪欢寮圭獥
@@ -763,12 +788,14 @@
this.open = val
this.editShow = false
this.openEdit = val
+ this.clearData()
this.getList()
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- axios.get(this.baseURL + "/Kf_MoveStockRequestBill/DeltetKf_MoveStockRequestBill", {
+ if (this.rowForm.鐘舵�� == "鍒涘缓") {
+ axios.get(this.baseURL + "/Kf_MoveStockRequestBill/DeltetKf_MoveStockRequestBill", {
params: { 'HInterID': this.rowForm.hmainid.toString() }
}).then(response => {
if (response.data.count == 1) {
@@ -780,7 +807,12 @@
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
+ } else {
+ this.$modal.msgError("姝ゆ暟鎹笉鏄垱寤虹姸鎬�,涓嶈兘鍒犻櫎锛�");
+ }
}).catch(() => { })
+
+
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
@@ -797,6 +829,44 @@
else {
this.$modal.msgError("閿欒:" + result.code + result.Message,);
}
+ this.clearData()
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ set_CloseBill(num) {
+ //閫昏緫鍏抽棴鏂规硶
+ axios.get(this.baseURL + "/Kf_MoveStockRequestBill/CloseKf_MoveStockRequestBill", {
+ params: { "HInterID": this.rowForm.hmainid, "Type": num, "user": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) {
+ this.$modal.msgSuccess(result.Message);
+ this.getList();
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ this.clearData()
+ }).catch(error => {
+ console.log(error)
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ set_DropBill(num) {
+ //閫昏緫浣滃簾鏂规硶
+ axios.get(this.baseURL + "/Kf_MoveStockRequestBill/DropKf_MoveStockRequestBill", {
+ params: { "HInterID": this.rowForm.hmainid.toString(), "Type": num, "user": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.count == 1) {
+ this.$modal.msgSuccess(result.Message);
+ this.getList();
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ this.clearData()
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
@@ -815,22 +885,8 @@
} else if (this.rowForm.鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
} else {
- axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
- params: { "HInterID": this.rowForm.hmainid }
- }).then(response => {
- var result = response.data
- if (result.count == 1) {
- this.printListShow = true
- this.openPrintList = true
- // this.$router.push({ path:'/printList', query: { linterid: this.rowForm.hmainid,MyMsg:this.rowForm.hmainid,Type:'Kf_SellOutBillList' }})
- } else {
- this.$modal.msgError(result.code + result.Message)
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
-
-
+ this.printListShow = true;
+ this.openPrintList = true;
}
// var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
},
--
Gitblit v1.9.1