From fd3724b55c385af544b1b769e9821f1447bb1b0a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 16 一月 2026 10:27:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
/dev/null | 1193 -------------------
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue | 58
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue | 10
src/views/logistics/transportGPS/WL_YayBill.vue | 176 ++
src/views/sell/XsSeOutStockBill.vue | 452 +-----
src/layout/components/AppMain.vue | 11
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 1700 +++++++++++++++++----------
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue | 12
8 files changed, 1,413 insertions(+), 2,199 deletions(-)
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 9209165..8cc8f75 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -72,7 +72,12 @@
}
}
</style>
-
+<style>
+.el-table ::-webkit-scrollbar {
+ width: 15px;
+ height: 15px;
+}
+</style>
<style lang="scss">
// fix css style bug in open el-dialog
.el-popup-parent--hidden {
@@ -81,7 +86,7 @@
}
}
-::-webkit-scrollbar {
+ ::-webkit-scrollbar {
width: 6px;
height: 6px;
}
@@ -91,7 +96,7 @@
}
::-webkit-scrollbar-thumb {
- background-color: #c0c0c0;
+ background-color: #666;
border-radius: 3px;
}
</style>
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
index 60b4e1b..ff29d0b 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
@@ -1,5 +1,5 @@
<template>
- <div style="padding: 10px;">
+ <div style="padding: 10px; position: relative;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
<el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px;">
<el-date-picker v-model="sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px;">
@@ -30,7 +30,7 @@
<el-form-item label="閮ㄩ棬" prop="HDeptID">
<el-input v-model="queryParams.HDeptID" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
</el-form-item>
-
+
<div slot="header" class="clearfix"><span>杩囨护</span></div>
<div>
<el-row>
@@ -163,19 +163,19 @@
</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">
- <edit :OperationType=OperationType :linterid=this.rowForm.hmainid||this.rowForm.HInterID :HSouceBillType=this.rowForm.HSourceBillType
- :copyType="copyType" @editClose="editClose" v-if="editShow" />
+ <edit :OperationType=OperationType :linterid=this.rowForm.hmainid || this.rowForm.HInterID
+ :HSouceBillType=this.rowForm.HSourceBillType :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>
@@ -192,6 +192,9 @@
export default {
name: 'Cg_ContractTransportBillMainList',
components: { RowSettings, Edit, PrintList },
+ props: {
+ openPage: { type: String, },
+ },
data() {
return {
HModName: "Cg_ContractTransportBillMainList",
@@ -251,13 +254,13 @@
// 鏌ヨ鍙傛暟
queryParams: {
HBillNo: '',
- HBillno2:'',
+ HBillno2: '',
HInitTimeCycle: 29,
- HDeptID:'',
+ HDeptID: '',
- HSourceBillNo:'',
- Warehouse:'',
- Hmaker:'',
+ HSourceBillNo: '',
+ Warehouse: '',
+ Hmaker: '',
ColName1: '',
ColName2: '',
ColName: '',
@@ -398,7 +401,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;
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
@@ -430,15 +433,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++) {
@@ -566,6 +569,9 @@
this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
+ if (this.openPage) {
+ this.$emit('deptEmit', row, 16)
+ }
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
@@ -576,7 +582,11 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 3
- this.handleEdit()
+ if (this.openPage) {
+ this.$emit('deptEmitDb', row, 6)
+ } else {
+ this.handleEdit()
+ }
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -664,9 +674,9 @@
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 + "%'";
}
- console.log("danjuhao1",this.queryParams.HBillNo)
+ console.log("danjuhao1", this.queryParams.HBillNo)
this.getList()
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
@@ -675,10 +685,10 @@
this.queryParams = {
HBillNo: '',
HInitTimeCycle: 29,
- HDeptID:'',
- HSourceBillNo:'',
+ HDeptID: '',
+ HSourceBillNo: '',
- Hmaker:'',
+ Hmaker: '',
ColName1: '',
ColName2: '',
ColName: '',
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill copy.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill copy.vue
deleted file mode 100644
index a9bdd92..0000000
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill copy.vue
+++ /dev/null
@@ -1,1193 +0,0 @@
-<template>
- <div v-loading="formLoading" v-if="formShow">
- <div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
- <el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
- <el-button type="primary" @click="set_CheckBill(0, form)">瀹� 鏍�</el-button>
- <el-button type="primary" @click="close">閫� 鍑�</el-button>
- <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
- </div>
- <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鍑鸿繍鍗�</div>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-tabs v-model="activeName" type="card">
- <el-tab-pane label="鍩烘湰淇℃伅" name="first">
- <el-row>
- <el-col :span="6">
- <el-form-item label="鍗曟嵁缂栧彿" prop="HBillNo">
- <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" disabled="true" />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT">
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="涓氬姟鍛�" prop="HEmpName">
- <el-input v-model="form.HEmpName" placeholder="璇疯緭鍏ヤ笟鍔″憳" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="閮ㄩ棬" prop="HDeptName">
- <el-input v-model="form.HDeptName" placeholder="璇疯緭鍏ラ儴闂�" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="渚涘簲鍟�" prop="HSupName">
- <el-input v-model="form.HSupName" placeholder="璇疯緭鍏ヤ緵搴斿晢" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍙戠エ缂栧彿" prop="HInvoiceBillNo">
- <el-input v-model="form.HInvoiceBillNo" placeholder="璇疯緭鍏ュ彂绁ㄧ紪鍙�" />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="浠撳簱" prop="HWHName">
- <el-input v-model="form.HWHName" placeholder="璇疯緭鍏ヤ粨搴�">
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="楠屾敹鍛�" prop="HSecManagerName">
- <el-input v-model="form.HSecManagerName" placeholder="璇疯緭鍏ラ獙鏀跺憳" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-form-item label="澶囨敞" prop="HRemark">
- <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
- </el-form-item>
- <el-form-item label="缁勭粐" prop="HOrgID">
- <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" @change="organizationChange" :disabled="zzSelDis">
- <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
- </el-option>
- </el-select>
- </el-form-item>
- </el-tab-pane>
- <el-tab-pane label="闄勮繎淇℃伅" name="second">
-</el-tab-pane>
- <el-tab-pane label="鍒跺崟淇℃伅" name="third">
- <el-row>
- <el-col :span="6">
- <el-form-item label="鍒跺崟浜�" prop="HMaker">
- <el-input v-model="form.HMaker" placeholder="璇疯緭鍏ュ埗鍗曚汉" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="淇敼浜�" prop="HUpDater">
- <el-input v-model="form.HUpDater" placeholder="璇疯緭鍏ヤ慨鏀逛汉" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="瀹℃牳浜�" prop="HChecker">
- <el-input v-model="form.HChecker" placeholder="璇疯緭鍏ュ鏍镐汉" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍏抽棴浜�" prop="HCloseMan">
- <el-input v-model="form.HCloseMan" placeholder="璇疯緭鍏ュ叧闂汉" disabled />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="鍒跺崟鏃ユ湡" prop="HMakeDate">
- <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="淇敼鏃ユ湡" prop="HUpDateDate">
- <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckDate">
- <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍏抽棴鏃ユ湡" prop="HCloseDate">
- <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="浣滃簾浜�" prop="HDeleteMan">
- <el-input v-model="form.HDeleteMan" placeholder="璇疯緭鍏ヤ綔搴熶汉" disabled />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="浣滃簾鏃ユ湡" prop="HDeleteDate">
- <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
- </el-tab-pane>
- </el-tabs>
- <div style="margin-bottom: 10px;">
- <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()" size="mini">澧炲姞涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
- size="mini">鎻掑叆涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow" size="mini">澶嶅埗涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-arrow-up" @click="handleMoveRowUp(zbSelForm)"
- size="mini">涓婄Щ</el-button>
- <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
- size="mini">涓嬬Щ</el-button>
- </div>
- <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
- @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">
- <template slot-scope="scope">
- <el-input v-model="scope.row.鐗╂枡浠ｇ爜" placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�" @keyup.native.f7="openDataDialog(3, scope.row)"
- @dblclick.native="openDataDialog(3, scope.row)" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.鐗╂枡鍚嶇О }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.瑙勬牸鍨嬪彿 }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
- </template>
- </el-table-column>
- <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">
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HQty" :min="0" style="width: 90px;"
- controls-position="right"></el-input-number>
- </template>
- </el-table-column>
- <el-table-column align="center" label="绋庣巼" width="120">
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HTaxRate" :min="0" style="width: 90px;"
- controls-position="right"></el-input-number>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍗曚环" width="120">
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 90px;"
- controls-position="right"></el-input-number>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍚◣鍗曚环" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HPrice * (1 + scope.row.HTaxRate*0.01) }}</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>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍚◣閲戦" width="120">
- <template slot-scope="scope">
- <span>{{ (scope.row.HPrice * (1 + scope.row.HTaxRate*0.01)) * scope.row.HQty }}</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>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鏀舵枡浠撳簱" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.鏀舵枡浠撳簱" placeholder="璇疯緭鍏ユ敹鏂欎粨搴�" @keyup.native.f7="openDataDialog(2, scope.row)"
- @dblclick.native="openDataDialog(2, scope.row)" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="浠撲綅鍚嶇О" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.鏀舵枡浠撲綅" placeholder="璇疯緭鍏ヤ粨浣嶅悕绉�" @keyup.native.f7="openDataDialog(2, scope.row)"
- @dblclick.native="openDataDialog(2, scope.row)" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="澶囨敞" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="閲囪喘鏁伴噺" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HReqBuyQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鎵规" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.HBatchNo" placeholder="璇疯緭鍏ユ壒娆�" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
- <template slot-scope="scope">
- <el-button type="danger" icon="el-icon-delete" size="mini" circle
- @click="handleDeleteSysZb(scope.row)"></el-button>
- </template>
- </el-table-column>
- </el-table>
- </el-form>
- <!-- 鏁版嵁寮圭獥 -->
- <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
- <!-- 閮ㄩ棬 -->
- <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
- <!-- 浠撳簱 -->
- <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
- <!-- 鐗╂枡 -->
- <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
- <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="openRowHide" width="816px" append-to-body>
- <RowSettings :colName="btResList" HModName="Kf_SellOutBillList" @rowEditClose="rowSetClose" v-if="rowHideShow" />
- </el-dialog>
- </div>
-</template>
-
-<script>
-import axios from 'axios'
-import moment from 'moment';
-import RowSettings from '@/views/component/rowSettings'
-import Dept from '@/views/component/dept'
-import Warehouse from '@/views/component/warehouse'
-import Material from '@/views/component/material'
-
-export default {
- name: 'SellOutBill',
- components: { Dept, Warehouse, Material, RowSettings },
- props: {
- OperationType: { type: Number, },
- linterid: { type: Number, },
- HSouceBillType: { type: String, },
- propsData: { type: String, },
- copyType: { type: Number, },
- },
- data() {
- return {
- baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣↖P)
-
- organizationList: [], //椤甸潰鍒濆鍖栫粍缁囧垪琛�
-
- loading: true, // 閬僵灞�
-
- addBtnShow: false, //鏂板鎸夐挳鏄剧ず鏍囪
- subDisabled: false, //淇濆瓨鎸夐挳绂佺敤鏍囪
-
- formShow: false, //琛ㄥ崟鏄惁鏄剧ず鏍囪
- formLoading: true, //琛ㄥ崟鍔犺浇閬僵
- zzSelDis: false, //缁勭粐涓嬫媺鍒楄〃绂佺敤鏍囪
-
- rowHideShow: false, //鍒楄缃粍浠跺鍣ㄦ樉绀烘爣璁�
- openRowHide: false, //鍒楄缃粍浠舵樉绀烘爣璁�
-
- dialogTitle: '', //寮圭獥鏍囬
- openData: false, //鏁版嵁寮圭獥
- dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
- deptShow: false, //閮ㄩ棬鏁版嵁缁勪欢鏄剧ず鏍囪
- warehouseShow: false, //浠撳簱鏁版嵁缁勪欢鏄剧ず鏍囪
- materialShow: false, //鐗╂枡鏁版嵁缁勪欢鏄剧ず鏍囪
- stockPlaceShow: false, //浠撲綅鏁版嵁缁勪欢鏄剧ず鏍囪
- deptform: {}, //寮圭獥閫変腑鏁版嵁
-
- temp: undefined, //涓存椂鍙橀噺
- btResList: [], // 鍒楄缃�
- form: {}, // 琛ㄥ崟鍙傛暟
- rules: { // 琛ㄥ崟鏍￠獙
- HSupName: [
- { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
- ],
- HDate: [
- { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
- ],
- HExRate: [
- { required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }
- ]
- },
-
- checkedSysZb: [],
- editData: [], //瀛愯〃鏁版嵁
- editBtData: [], //瀛愯〃琛ㄥご
- activeName: 'first',
- zbIndex: null,
- zbSelForm: {}, //瀛愯〃閫変腑鏁版嵁,鐢ㄤ簬瀛愯〃澶嶅埗銆佷笂绉汇�佷笅绉荤瓑鎿嶄綔
-
- HInterID: null,
- hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
- title: "", // 寮瑰嚭灞傛爣棰�
- open: false, // 鏄惁鏄剧ず寮瑰嚭灞�
- dateRange: [], // 鏃ユ湡鑼冨洿
- // 鏌ヨ鍙傛暟
- queryParams: {
- HBillNo: '',
- HInitTimeCycle: 29,
- HProjectNumber: '',
- HCusID: null,
- HMaterNumber: '',
- HMaterName: '',
- ColName1: '',
- ColName2: '',
- ColName: '',
- Comparator1: '',
- Comparator2: '',
- Comparator: '',
- ColContent1: '',
- ColContent2: '',
- ColContent: '',
- },
- showSearch: true, // 鏄剧ず鎼滅储鏉′欢
- ids: [], // 瀛愯〃閫変腑鏁版嵁
- single: true, // 闈炲崟涓鐢�
- multiple: true, // 闈炲涓鐢�
-
-
- };
- },
- created() {
- this.fetchData()
- this.getdata()
- },
- beforeDestroy() {
- // 涓嬮潰鐨勪唬鐮佷細瀵艰嚧椤甸潰宕╂簝锛屽厛娉ㄩ噴鎺�
- // this.$destroy()
- },
- methods: {
- //#region 琛ㄥ崟鏁版嵁鍒濆鍖�
- getdata() {
- this.formShow = false
- this.formLoading = true
-
- if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
- this.handleAdd()
- }
- else if (this.OperationType == 3 || this.copyType == 1) {
- this.handleUpdate()
- }
- else if (this.OperationType == 4) {
- this.zzSelDis = true
- this.handleAdd()
- var data = this.getUrlVars_JSON();
- var dataArray = [];
- for (var i = 0; i < data.length; i++) {
- // this.getPushSourceBillInit(data[i].hmainid, data[i].hsubid);
- axios.get(this.$baseUrl + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
- params: {
- "HInterID": data[i].hmainid
- , "HSubID": data[i].hsubid
- },
- }).then(response => {
- let result = response.data
- if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- this.temp = result.data[0];
- } else {
- this.temp = result.data;
- }
- if (this.temp) {
- dataArray.push(this.temp);
- this.form.HDeptID = dataArray[0].HDeptID
- this.form.HDeptName = dataArray[0].閮ㄩ棬
- this.form.HEmpID = dataArray[0].HEmpID
- this.form.HEmpName = dataArray[0].涓氬姟鍛�
- this.form.HManagerID = dataArray[0].HManagerID
- this.form.HManagerName = dataArray[0].涓荤
- this.form.HMainSourceInterID = "0"
- this.form.HMainSourceEntryID = "0"
- this.form.HMainSourceBillNo = ""
- this.form.HMainSourceBillType = dataArray[0].HBillType
- this.form.HSupID = dataArray[0].HCusID
- this.form.HSupName = dataArray[0].瀹㈡埛
- this.form.HLinkMan = dataArray[0].鑱旂郴浜�
- this.form.HLinkPhone = dataArray[0].鑱旂郴鐢佃瘽
- this.form.HSellSID = dataArray[0].HSellSID
- this.form.HSellSName = dataArray[0].閿�鍞柟寮�
- this.form.HCurID = dataArray[0].HCurID
- this.form.HCurName = dataArray[0].甯佸埆
- this.form.HExRate = dataArray[0].姹囩巼
- for (var i = 0; i < dataArray.length; i++) {
- this.editData.push(
- {
- "HMaterID": dataArray[i].HMaterID
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].HUnitID
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQtyMust": dataArray[i].鏁伴噺.toFixed(6)
- , "HQty": dataArray[i].鏁伴噺.toFixed(6)
- , "HPieceQty": "0"
- , "HPrice": dataArray[i].鍗曚环.toFixed(4)
- , "HTaxPrice": dataArray[i].瀹為檯鍚◣鍗曚环.toFixed(4)
- , "HTaxRate": dataArray[i].绋庣巼
- , "HMoney": dataArray[i].閲戦.toFixed(2)
- , "HTaxMoney": dataArray[i].浠风◣鍚堣.toFixed(2)
- , "HWHID": dataArray[i].HWHID
- , "鍙戣揣浠撳簱": dataArray[i].HWHName
- , "HRemark": ""
- , "HQty_Full": "0"
- , "HQty_Empty": "0"
- , "HQty_Back": "0"
- , "HCostPrice": "0"
- , "HCostMoney": "0"
- , "HSalePrice": "0"
- , "HSeOrderInterID": dataArray[i].hmainid
- , "HSeOrderEntryID": dataArray[i].hsubid
- , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
- , 'HSPID': "0"
- , 'HSPName': ""
- , 'HSPGroupID': "0"
- , "HSPGroupName": ""
- , 'HSCWHID': "0"
- , 'HSCWHName': ""
- , 'HSCSPID': "0"
- , 'HSCSPName': ""
- , 'HBatchNo': ""
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
- , 'HPropertyID': "0"
- , 'HPropertyName': ""
- , 'HSecUnitID': "0"
- , 'HSecUnitName': ""
- , 'HSecUnitRate': "0"
- , 'HEngineNum': ""
- , 'HUnderPanNum': ""
- , 'HLeaveFactCard': ""
- , 'HReqBuyQty': "0"
- , 'HReqOutQty': "0"
- , 'HCurrentInventory': "0"
- }
- );
- }
- }
- this.$nextTick(() => {
- this.formShow = true
- this.formLoading = false
- })
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- }
- }
- },
- //#endregion
-
- //#region 椤甸潰鏁版嵁鍒濆鍖�
- reset() {
- this.form = {
- HInterID: 0,
- HBillNo: "",
- HDate: new Date(),
- HEmpID: 0,
- HEmpName: "",
- HDeptID: 0,
- HDeptName: "",
- HSupID: 0,
- HSupName: "",
- HInvoiceBillNo: "",
- HWHID: 0,
- HWHName: "",
- HSecManagerID: 0,
- HSecManagerName: "",
- HRemark: "",
- HOrgID: sessionStorage["OrganizationID"] - 0,
- HMaker: sessionStorage["HUserName"],
- HChecker: "",
- HCloseMan: "",
- HUpDater: "",
- HDeleteMan: "",
- HMakeDate: "",//new Date().format("yyyy-MM-dd hh:mm:ss"),
- HCheckDate: "",
- HCloseDate: "",
- HUpDateDate: "",
- HDeleteDate: "",
- BillType: '1402',
- HBillSubType: '1205',
- HSTOCKORGID: sessionStorage["OrganizationID"] - 0,//缁勭粐id
- HOWNERID: sessionStorage["OrganizationID"] - 0,
-
-
- HManagerID: 0,
- HManagerName:"",
- HKeeperID: 0,
- HKeeperName: "",
- HProjectID: 0,
- HProjectNumber: "",
- HProjectName: "",
-
-
- HCurID: 0,
- HCurName: '',
- HExRate: 1,
- HSourceBillType: "",
- HMainSourceInterID: 0,
- HMainSourceEntryID: 0,
- HMainSourceBillType: '',
- HMainSourceBillNo: '',
- HExplanation :"",
- HInnerBillNo: "",
- }
- this.editData = []
- this.editBtData = []
- this.ids = []
- this.subDisabled = false
- this.addBtnShow = false
- // this.$refs.tableData.clearSelection()
- this.activeName = 'first'
- this.resetForm("form");
- },
- //#endregion
-
- //#region 鏂板鎸夐挳鎿嶄綔
- handleAdd() {
- this.reset()
- //鏂板鑾峰彇鍗曟嵁鍙�
- this.getHBillNo()
- if (this.OperationType == 1) {
- this.handleAddSysZb()
- }
- this.$nextTick(() => {
- this.formShow = true
- this.formLoading = false
- })
- },
- //#endregion
-
- //#region 缂栬緫椤甸潰鍒濆鍖�
- handleUpdate() {
- this.reset()
- let rowHmainid = this.linterid
- axios.get(this.$baseUrl + "/Kf_POStockInBill/cx", {
- params: { 'HInterID': rowHmainid }
- }).then(response => {
- if (response.data.count == 1) {
- var result = response.data
- var data = response.data.data[0]
- this.form.BillType = data.HSourceBillType
- if (this.copyType == 1) {
- this.getHBillNo()
- }
- else {
- this.form.HInterID = data.hmainid
- this.form.HBillNo = data.鍗曟嵁鍙�
- this.form.HDate = data.鏃ユ湡
- this.form.HMaker = data.鍒跺崟浜�
- this.form.HUpDater = data.淇敼浜�
- this.form.HChecker = data.瀹℃牳浜�
- this.form.HMakeDate = data.鍒跺崟鏃ユ湡
- this.form.HUpDateDate = data.淇敼鏃ユ湡
- this.form.HCheckDate = data.瀹℃牳鏃ユ湡
- this.form.HCloseMan = data.鍏抽棴浜�
- this.form.HDeleteMan = data.浣滃簾浜�
- this.form.HCloseDate = data.鍏抽棴鏃ユ湡
- this.form.HDeleteDate = data.浣滃簾鏃ユ湡
- }
- this.form.HEmpID= data.HEmpID
- this.form.HEmpName= data.涓氬姟鍛�
- this.form.HDeptID= data.HDeptID
- this.form.HDeptName= data.閮ㄩ棬
- this.form.HSupID= data.HSupID
- this.form.HSupName= data.渚涘簲鍟�
- this.form.HInvoiceBillNo= data.鍙戠エ缂栧彿
- this.form.HWHID= data.涓昏〃浠撳簱ID
- this.form.HWHName= data.涓昏〃浠撳簱
- this.form.HSecManagerID= data.HSecManagerID
- this.form.HSecManagerName= data.楠屾敹鍛�
- this.form.HRemark= data.琛ㄥご澶囨敞
- this.form.HOrgID = data.HOrgID
- this.form.HSTOCKORGID = data.HOrgID
- this.form.HOWNERID = data.HOrgID
-
- this.form.HKeeperID= data.HKeeperID
- this.form.HKeeperName= data.淇濈鍛�
- this.form.HSourceBillType= data.婧愬崟绫诲瀷
- this.form.HManagerID= data.HManagerID
- this.form.HManagerName= data.璐熻矗浜�
- this.form.HExRate= data.姹囩巼
- this.form.HProjectID= data.HProjectID
- this.form.HProjectNumber= data.椤圭洰浠ｇ爜
- this.form.HProjectName= data.椤圭洰鍚嶇О
- this.form.HCurID = data.HCurID
- this.form.HCurName = data.甯佸埆
- this.form.HExRate = data.姹囩巼
- this.form.HBillSubType = data.HBillSubType
- this.form.HMainSourceInterID = data.HMainSourceInterID
- this.form.HMainSourceEntryID = data.HMainSourceEntryID
- this.form.HMainSourceBillType = data.HMainSourceBillType
- this.form.HMainSourceBillNo = data.HMainSourceBillNo
- this.form.HExplanation =data.鎽樿
- this.form.HInnerBillNo= data.鍐呴儴鍗曟嵁鍙�
-
- //瀛愯〃 璧嬪��
- for (var i = 0; i < result.data.length; i++) {
- this.editData.push(
- {
- "HMaterID": result.data[i].HMaterID
- , "鐗╂枡浠ｇ爜": result.data[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
- , "HUnitID": result.data[i].HUnitID
- , "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅
- , "HQtyMust": result.data[i].搴旀敹鏁伴噺
- , "HQty": result.data[i].瀹炴敹鏁伴噺
- , "HRemark": result.data[i].琛ㄤ綋澶囨敞
- , "HPrice": result.data[i].鍗曚环
- , "HMoney": result.data[i].閲戦
- , "HOrderPrice": result.data[i].閲囪喘閲戦
- , "HWHID": result.data[i].HWHID
- , "鏀舵枡浠撳簱": result.data[i].鏀舵枡浠撳簱
- , "HSPID": result.data[i].HSPID
- , "浠撲綅鍚嶇О": result.data[i].浠撲綅鍚嶇О
- , "HBatchNo": result.data[i].鎵规
- , "HSourceBillNo": result.data[i].婧愬崟鍗曞彿 //婧愬崟鍙�
- , "HSourceBillType": result.data[i].婧愬崟绫诲瀷 //婧愬崟绫诲瀷
- , "HSourceInterID": result.data[i].婧愬崟涓诲唴鐮� //婧愬崟涓诲唴鐮�
- , "HSourceEntryID": result.data[i].婧愬崟瀛愬唴鐮� //婧愬崟瀛愬唴鐮�
- , "HTaxRate": result.data[i].绋庣巼
- , "HTaxPrice": result.data[i].鍚◣鍗曚环
- , "HlineTotal": result.data[i].鍚◣閲戦
- }
- )
- }
-
- if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
- this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
- this.subDisabled = true
- }
- this.formShow = true
- this.formLoading = false
-
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //#endregion
-
- //#region 鍒楄缃�
- handleRowHide() {
- this.rowHideShow = true
- this.openRowHide = true
- },
- rowSetClose(val) {
-
- this.rowHideShow = false
- this.openRowHide = val
- this.$destroy()
- },
- //#endregion
-
- //#region 缁勭粐鍊煎彉鏇翠簨浠�
- organizationChange(val) {
- // let options=undefined
- // this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
- },
- //#endregion
-
- //#region 鏁版嵁寮圭獥
- //#region 鎵撳紑鏁版嵁鍒楄〃寮圭獥
- openDataDialog(num, row) {
- if (row) {
- this.zbIndex = row.index - 1
- }
- this.showReset()
- if (num == 1) {
- this.dialogTitle = '閮ㄩ棬鍒楄〃'
- this.deptShow = true
- this.openData = true
- } else if (num == 2) {
- this.dialogTitle = '鍑哄簱浠撳簱鍒楄〃'
- this.warehouseShow = true
- this.openData = true
- } else if (num == 3) {
- this.dialogTitle = '鐗╂枡鍒楄〃'
- this.materialShow = true
- this.openData = true
- }else if (num == 4) {
- this.dialogTitle = '浠撲綅鍒楄〃'
- this.stockPlaceShow = true
- this.openData = true
- }
- },
- //#region 灏嗘暟鎹脊绐楀叏閮ㄥ彇娑堝姞杞�
- showReset() {
- this.deptShow = false
- this.warehouseShow = false
- this.materialShow = false
- },
- //#endregion
- //#endregion
-
- //#region 寮圭獥鏁版嵁鍙屽嚮杩斿洖琛ㄥ崟璧嬪�间簨浠�
- dbEmitData(deptRow, num) {
- if (num == 1) {
- this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О //閮ㄩ棬
- this.form.HDeptID = deptRow.HItemID
- this.form.HEmpID = deptRow.HEmpID
- this.form.HManagerName = deptRow.璐熻矗浜�
- this.openData = false
- }
- else if (num == 2) { //鏀舵枡浠撳簱
- this.editData[this.zbIndex].HWHID = deptRow.HItemID;
- this.editData[this.zbIndex].鏀舵枡浠撳簱 = deptRow.浠撳簱鍚嶇О;
- this.openData = false
- }
- else if (num == 4) { //浠撲綅
- this.editData[this.zbIndex].HSPID = deptRow.HItemID;
- this.editData[this.zbIndex].浠撲綅鍚嶇О = deptRow.浠撲綅鍚嶇О;
- this.openData = false
- }
- else if (num == 3) { //鐗╂枡
- this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
- this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜;
- this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
- this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
- this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿
- this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅鍚嶇О
- this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�
- this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼
- this.openData = false
- }
- },
- //#endregion
-
- //#region 寮圭獥鏁版嵁鍗曞嚮浜嬩欢
- emitData(deptRow, num) {
- this.dialogTypeNum = num
- this.deptform = deptRow
- },
- //#endregion
-
- //#region 寮圭獥纭畾浜嬩欢
- deptClickSub() {
- this.dbEmitData(this.deptform, this.dialogTypeNum)
- this.deptform = {}
- },
- //#endregion
-
- //#region 寮圭獥鍙栨秷浜嬩欢
- deptClose() {
- this.deptform = {}
- this.openData = false
- },
- //#endregion
- //#endregion
-
- //#region 宸ュ叿鏍忔寜閽搷浣�
- //#region 缂栬緫鎻愪氦淇濆瓨
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- let fhck = false
- this.editData.map((item, index) => {
- if (!item.鍙戣揣浠撳簱) {
- fhck = true
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
- }
- })
- this.$nextTick(() => {
- if (!fhck) {
- var sMainStr = JSON.stringify(this.form);
- var sSubStr = JSON.stringify(this.editData);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
- axios({
- method: 'post',
- url: this.$baseUrl + "/Kf_SellOutBill/SaveSellOutBillList",
- data: {
- 'msg': sMainSub
- },
- }).then(response => {
- if (response.data.count == 1) {
- this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
- this.$modal.msgSuccess(response.data.Message);
- this.get_MAXNum_Task(1);//璁剧疆娴佹按鍙峰鍔�
- if (response.data.Verify == "Y") //鑷姩瀹℃牳
- {
- this.set_CheckBill(0, this.form); //瀹℃牳
- }
- this.addBtnShow = true
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- }
- })
- }
- });
- },
- //#endregion
-
- //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
- set_CheckBill(num, form) {
- var InterID = form.hmainid || form.HInterID
- //閫昏緫瀹℃牳鏂规硶
- axios.get(this.$baseUrl + "/Kf_SellOutBill/AuditKf_SellOutBill", {
- params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
- }).then(response => {
- let result = response.data
- if (result.code == 1) {
- this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
- }
- else {
- this.$modal.msgError("閿欒:" + result.code + result.Message,);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //#endregion
-
- //#region 閫�鍑烘寜閽搷浣�
- close() {
- this.reset()
-
- if (!this.OperationType && !this.copyType) {
- // this.$router.back()
- window.close()
- } else {
- this.formShow = false
- this.$emit('editClose', false)
- }
- },
- //#endregion
- //#endregion
-
- //#region 瀛愯〃鎿嶄綔
- //#region 璁剧疆瀛愯〃搴忓彿鍒�
- rowSysZbIndex({ row, rowIndex }) {
- row.index = rowIndex + 1;
- },
- //#endregion
-
- //#region 瀛愯〃鏂板銆佹彃鍏ユ寜閽搷浣�
- handleAddSysZb(index, num) {
- if (num == 1 && !index) {
- this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
- } else {
- let obj = {
- HMaterID: 0,
- 鐗╂枡浠ｇ爜: '',
- 鐗╂枡鍚嶇О: '',
- 瑙勬牸鍨嬪彿: '',
- HUnitID: 0,
- 璁￠噺鍗曚綅: '',
- HQtyMust: 1,
- HQty: 1,
- HPieceQty: 0,
- HPrice: 0,
- HTaxPrice: 0,
- HTaxRate: 0,
- HMoney: 0,
- HTaxMoney: 0,
- HWHID: 0,
- 鍙戣揣浠撳簱: '',
- HRemark: '',
- HQty_Full: 0,
- HQty_Empty: 0,
- HQty_Back: 0,
- HCostPrice: 0,
- HCostMoney: 0,
- HSalePrice: 0,
- HSeOrderInterID: 741,
- HSeOrderEntryID: 18,
- HSeOrderBillNo: 'XSFH00000747',
- HSourceInterID: 741,
- HSourceEntryID: 18,
- HSourceBillNo: 'XSFH00000747',
- HSourceBillType: 1402,
- HRelationQty: 0,
- HRelationMoney: 0,
- HSPID: 0,
- HSPName: '',
- HSPGroupID: 0,
- HSPGroupName: '',
- HSCWHID: 0,
- HSCWHName: '',
- HSCSPID: 0,
- HSCSPName: '',
- HBatchNo: '',
- HPOOrderInterID: 0,
- HPOOrderEntryID: 0,
- HPOOrderBillNo: '',
- HPropertyID: 0,
- HPropertyName: '',
- HSecUnitID: 0,
- HSecUnitName: '',
- HSecUnitRate: 0,
- HEngineNum: '',
- HUnderPanNum: '',
- HLeaveFactCard: '',
- HReqBuyQty: 0,
- HReqOutQty: 0,
- HCurrentInventory: 0,
- }
- if (index) {
- this.editData.splice(index, 0, obj);
- this.$set(this.editData, index, obj)
- } else {
- this.editData.push(obj);
- }
- }
- },
- //#endregion
-
- //#region 瀛愯〃澶嶅埗鎸夐挳
- handleCopyZbRow() {
- if (!this.zbIndex) {
- this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
- } else {
- let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
- this.editData.push(copyRow);
- }
- },
- //#endregion
-
- //#region 瀛愯〃涓婄Щ鎸夐挳
- handleMoveRowUp(zbSelForm) {
- if (!this.zbIndex) {
- this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
- } else {
- if (zbSelForm.index == 1) {
- this.$modal.msgError("绗竴琛屾暟鎹棤娉曚笂绉�");
- } else { // 纭繚涓嶆槸绗竴琛�
- let num = zbSelForm.index - 1
- const record = this.editData.splice(num, 1)[0];
- this.editData.splice(num - 1, 0, record);
- }
- }
- },
- //#endregion
-
- //#region 瀛愯〃涓嬬Щ鎸夐挳
- handleMoveRowDown(zbSelForm) {
- if (!this.zbIndex) {
- this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
- } else {
- if (zbSelForm.index == this.editData.length) {
- this.$modal.msgError("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉�");
- } else { // 纭繚涓嶆槸绗竴琛�
- let num = zbSelForm.index - 1
- const record = this.editData.splice(num, 1)[0];
- this.editData.splice(num + 1, 0, record);
- }
- }
- },
- //#endregion
-
- //#region 瀛愯〃鍒犻櫎鎸夐挳
- handleDeleteSysZb(row) {
- this.checkedSysZb = []
- this.checkedSysZb.push(row.index)
- if (this.checkedSysZb.length == 0) {
- this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑鍟嗗搧璁㈠崟鏄庣粏鏁版嵁");
- } else {
- const editData = this.editData;
- const checkedSysZb = this.checkedSysZb;
- this.editData = editData.filter(function (item) {
- return checkedSysZb.indexOf(item.index) == -1
- });
- }
- },
- //#endregion
-
- //#region 瀛愯〃澶嶉�夋閫変腑鏁版嵁
- handleTableZbEdit(selection) {
- this.checkedSysZb = selection.map(item => item.index)
- this.zbSelForm = selection[0]
- this.zbIndex = this.checkedSysZb[0]
- if (selection.length > 1) {
- const del_row = selection.shift()
- this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
- }
- },
- //#endregion
- //#endregion
-
- //#region 閫氱敤鏂规硶銆�
- //#region 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
- getUrlVars_JSON() {
- var datajson;
- var str = this.propsData; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
- var arr = str.substring(str.lastIndexOf("=") + 1);
- datajson = JSON.parse(decodeURI(arr));
- return datajson;
- },
- //#endregion
-
- //#region 缁勭粐涓嬫媺鍒楄〃鏁版嵁鍒濆鍖�
- fetchData() {
- axios.get(this.$baseUrl + "/Web/GetOrganizations", {
- }).then(response => {
- if (response.data.count == 1) {
- this.organizationList = response.data.data;//缁勭粐鍒楄〃
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //#endregion
-
- //#region 鑾峰彇鍐呯爜銆佸崟鎹彿
- getHBillNo() {
- axios.get(this.$baseUrl + "/WEBSController/GetMaxBillNoAndID_Json", {
- params: {
- HBillType: '1201'
- }
- }).then(response => {
- this.form.HBillNo = response.data.data[0].HBillNo
- this.form.HInterID = response.data.data[0].HInterID
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //#endregion
-
- //#region 鑾峰彇鏈�澶у崟鎹彿
- get_MAXNum_Task(Type) {
- var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1201','${this.form.HDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
- axios({
- method: 'get',
- url: this.$baseUrl + "/CommonModel/searchMethod",
- params: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" },
- }).then(response => {
- if (response.data.count == 1) {
- this.form.HBillNo = response.data.data[0].HBillNo;
- } else {
- this.$modal.msgError(response.data.code + response.data.Message);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //#endregion
-
- //#region 鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
- getCzyglByUser() {
- axios.get(this.$baseUrl + '/Xs_SeOrderBill/getCzyglByUser', {
- params: { "CurUserName": sessionStorage["HUserName"] }
- }).then(response => {
- let dataForm = response.data.data[0]
- this.form.HDeptID = dataForm.HDeptID
- this.form.HDeptName = dataForm.HDeptName
- this.form.HEmpID = dataForm.HEmpID
- this.form.HEmpName = dataForm.HEmpName
- this.form.HManagerID = dataForm.HManagerID
- this.form.HManagerName = dataForm.HManagerName
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //#endregion
-
- //#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
- getCustomerBalance(HCusID) {
- axios.get(this.$baseUrl + '/Xs_CusRatingChangeBill/getCustomerBalance', {
- params: { "HCusID": HCusID, 'CurUserName': sessionStorage["HUserName"] }
- }).then(response => {
- var data = response.data.data[0];
- this.form.HCusBalance = data.HCusBalance
- this.form.HCreditRating_Now = data.HCreditRating_Now
- this.form.HAvailableBalance = data.HAvailableBalance
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //#endregion
-
- //#region 鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
- getCustomerByCusID(HCusID) {
- axios.get(this.$baseUrl + "/Xs_SeOrderBill/getCustomerByCusID", {
- params: {
- HCusID: HCusID
- }
- }).then(response => {
- this.form.鑱旂郴浜� = response.data.data[0].HLinkMan
- this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone
- // this.form = response.data.data[0]
-
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //#endregion
-
- //#region 鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁�
- getBarCodeNoteBySellOutBill(rowHmainid) {
- axios.get(this.$baseUrl + '/Kf_SellOutBill/BarCodeNote', {
- params: { "HInterID": rowHmainid }
- }).then(response => {
- if (response.data.count == 1) {
- if (response.data.data[2].length > 0) {
- this.$modal.msgError("褰撳墠鍗曟嵁鐢辨壂鐮佺敓鎴愶紝涓嶅彲浠ョ紪杈戯紒");
- this.subDisabled = true
- }
- } else { }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //#endregion
-
- //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞鍗曟暟鎹�
- getPushSourceBillInit(HSourceInterID, HSourceEntryID) {
- axios.get(this.$baseUrl + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
- params: {
- "HInterID": HSourceInterID
- , "HSubID": HSourceEntryID
- },
- }).then(response => {
- let result = response.data
- if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- this.temp = result.data[0];
- } else {
- this.temp = result.data;
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //#endregion
- //#endregion
- }
-};
-</script>
-<style>
-.xsckdBox .el-date-editor.el-input {
- width: 100%;
-}
-</style>
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index a56b14b..dd99f79 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -7,425 +7,527 @@
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
<div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">杩愬崟缂栬緫鏂板</div>
- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
- <el-tabs v-model="activeName" type="card">
- <el-tab-pane label="鍩烘湰淇℃伅" name="first">
- <el-row>
- <el-col :span="6">
- <el-form-item label="鍗曟嵁缂栧彿" prop="HBillNo">
- <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡"
- value-format="yyyy-MM-ddT">
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="婧愬崟鍙�" prop="HMainSourceBillNo">
- <el-input v-model="form.HMainSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞彿">
- <el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(12)"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="鎵胯繍鍟�" prop="HCarrierName">
- <el-input v-model="form.HCarrierName" placeholder="璇疯緭鍏ユ壙杩愬晢">
- <el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(6)"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="瀹㈡埛" prop="HCusName">
- <el-input v-model="form.HCusName" placeholder="璇疯緭鍏ュ鎴�">
- <el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(7)"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="濮嬪彂鍦�" prop="HBeginAddrName">
- <el-input v-model="form.HBeginAddrName" placeholder="璇疯緭鍏ュ鍙戝湴">
- <el-button slot="append" icon="el-icon-search"
- @click="openDataDialog('鏆傛棤')"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鐩殑鍦�" prop="HEndAddrName">
- <el-input v-model="form.HEndAddrName" placeholder="璇疯緭鍏ョ洰鐨勫湴">
- <el-button slot="append" icon="el-icon-search"
- @click="openDataDialog('鏆傛棤')"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="杞﹀瀷" prop="HCarTypeName">
- <el-input v-model="form.HCarTypeName" placeholder="璇疯緭鍏ヨ溅鍨�">
- <el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(13)"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="杞﹀瀷鏈�澶у绉�" prop="HCarTypeMaxVolume">
- <el-input v-model="form.HCarTypeMaxVolume" placeholder="璇疯緭鍏ヨ溅鍨嬫渶澶у绉�" readonly />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鎵胯繍鍚堝悓" prop="HContractTransportBillNo">
- <el-input v-model="form.HContractTransportBillNo" placeholder="璇疯緭鍏ユ壙杩愬悎鍚�">
- <el-button slot="append" icon="el-icon-search"
- @click="openDataDialog('鏆傛棤')"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="璺濈锛堝叕閲岋級" prop="HDistance">
- <el-input v-model="form.HDistance" placeholder="璇疯緭鍏ヨ窛绂�" readonly />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="杩愯緭鏃舵晥" prop="HTransportTimes">
- <el-input v-model="form.HTransportTimes" placeholder="璇疯緭鍏ヨ繍杈撴椂鏁�" readonly />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="杩愯緭绫诲瀷" prop="HTransportTyep">
- <el-input v-model="form.HTransportTyep" placeholder="璇疯緭鍏ヨ繍杈撶被鍨�" readonly />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="缁撶畻鏂瑰紡" prop="HSSName">
- <el-input v-model="form.HSSName" placeholder="璇疯緭鍏ョ粨绠楁柟寮�">
- <el-button slot="append" icon="el-icon-search"
- @click="openDataDialog('鏆傛棤')"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="甯佸埆" prop="HCurName">
- <el-input v-model="form.HCurName" placeholder="璇疯緭鍏ュ竵鍒�">
- <el-button slot="append" icon="el-icon-search"
- @click="openDataDialog('鏆傛棤')"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="姹囩巼" prop="HExRate">
- <el-input v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" readonly />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="杩愯垂" prop="HMoney">
- <el-input v-model="form.HMoney" placeholder="璇疯緭鍏ヨ繍璐�" />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鎬讳綋绉�" prop="HTotalVolume">
- <el-input v-model="form.HTotalVolume" placeholder="璇疯緭鍏ユ�讳綋绉�" />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="瑁呰浇鐜�" prop="HLoadingRate">
- <el-input v-model="form.HLoadingRate" placeholder="璇疯緭鍏ヨ杞界巼" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="鎻愯揣鍦板潃" prop="HPickAddr">
- <el-input v-model="form.HPickAddr" placeholder="璇疯緭鍏ユ彁璐у湴鍧�" />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍒拌揪鍦板潃" prop="HArriverAddr">
- <el-input v-model="form.HArriverAddr" placeholder="璇疯緭鍏ュ埌杈惧湴鍧�" />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="杩愯緭鏂瑰紡" prop="HTransType">
- <el-select v-model="form.HTransType" placeholder="璇烽�夋嫨杩愯緭鏂瑰紡">
- <el-option label="鏁磋溅" value="1"></el-option>
- <el-option label="闆舵媴" value="2"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="缁勭粐" prop="HOrgID">
- <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" @change="organizationChange"
- :disabled="zzSelDis">
- <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name"
- :value="item.ID">
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="瑕佹眰鎻愯揣鏃ユ湡" prop="HDateForRequestedPick">
- <el-date-picker v-model="form.HDateForRequestedPick" type="date" placeholder="閫夋嫨瑕佹眰鎻愯揣鏃ユ湡"
- value-format="yyyy-MM-ddT">
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鎵胯繍鍟嗙‘璁ゆ棩鏈�" prop="HDate_CarrierSure">
- <el-date-picker v-model="form.HDate_CarrierSure" type="date" placeholder="閫夋嫨鎵胯繍鍟嗙‘璁ゆ棩鏈�"
- value-format="yyyy-MM-ddT">
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍒嗛厤鍙告満鏃ユ湡" prop="HDate_AllocationDriver">
- <el-date-picker v-model="form.HDate_AllocationDriver" type="date" placeholder="閫夋嫨鍒嗛厤鍙告満鏃ユ湡"
- value-format="yyyy-MM-ddT">
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="瑕佹眰鍒拌揪鏃ユ湡" prop="HDataForRequestedArrived">
- <el-date-picker v-model="form.HDataForRequestedArrived" type="date"
- placeholder="閫夋嫨瑕佹眰鍒拌揪鏃ユ湡" value-format="yyyy-MM-ddT">
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="鎵胯繍鐘舵��" prop="HCarryStatus">
- <el-select v-model="form.HCarryStatus" placeholder="璇烽�夋嫨鎵胯繍鐘舵��">
- <el-option label="鏈紑濮�" value="0"></el-option>
- <el-option label="杩涜涓�" value="1"></el-option>
- <el-option label="宸插畬鎴�" value="2"></el-option>
- <el-option label="宸插彇娑�" value="3"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="杞﹁締" prop="HCarName">
- <el-input v-model="form.HCarName" placeholder="璇疯緭鍏ヨ溅杈�">
- <el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(14)"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍙告満" prop="HDriverName">
- <el-input v-model="form.HDriverName" placeholder="璇疯緭鍏ュ徃鏈�">
- <el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(15)"></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- </el-row>
- </el-tab-pane>
- <el-tab-pane label="闄勮繎淇℃伅" name="second">
- </el-tab-pane>
- <el-tab-pane label="鍒跺崟淇℃伅" name="third">
- <el-row>
- <el-col :span="6">
- <el-form-item label="鍒跺崟浜�" prop="HMaker">
- <el-input v-model="form.HMaker" placeholder="璇疯緭鍏ュ埗鍗曚汉" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="淇敼浜�" prop="HUpDater">
- <el-input v-model="form.HUpDater" placeholder="璇疯緭鍏ヤ慨鏀逛汉" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="瀹℃牳浜�" prop="HChecker">
- <el-input v-model="form.HChecker" placeholder="璇疯緭鍏ュ鏍镐汉" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍏抽棴浜�" prop="HCloseMan">
- <el-input v-model="form.HCloseMan" placeholder="璇疯緭鍏ュ叧闂汉" disabled />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="鍒跺崟鏃ユ湡" prop="HMakeDate">
- <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="淇敼鏃ユ湡" prop="HUpDateDate">
- <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckDate">
- <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍏抽棴鏃ユ湡" prop="HCloseDate">
- <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="浣滃簾浜�" prop="HDeleteMan">
- <el-input v-model="form.HDeleteMan" placeholder="璇疯緭鍏ヤ綔搴熶汉" disabled />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="浣滃簾鏃ユ湡" prop="HDeleteDate">
- <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
- </el-tab-pane>
- </el-tabs>
- <div style="margin-bottom: 10px;">
- <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()"
- size="mini">澧炲姞涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
- size="mini">鎻掑叆涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow"
- size="mini">澶嶅埗涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-arrow-up" @click="handleMoveRowUp(zbSelForm)"
- size="mini">涓婄Щ</el-button>
- <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
- size="mini">涓嬬Щ</el-button>
- </div>
- <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
- @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">
- <template slot-scope="scope">
- <span>{{ scope.row.HSourceBillNo }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鐗╂枡浠ｇ爜" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.HMaterNumber" placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�"
- @keyup.native.f7="openDataDialog(15, scope.row)"
- @dblclick.native="openDataDialog(15, scope.row)" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HMaterName }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍣ㄥ叿浠ｇ爜" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.HMouldNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�"
- @keyup.native.f7="openDataDialog(16, scope.row)"
- @dblclick.native="openDataDialog(16, scope.row)" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍣ㄥ叿鍚嶇О" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HMouldName }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瀹瑰櫒闀垮害" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HMouldLength }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瀹瑰櫒瀹藉害" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HMouldWidth }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瀹瑰櫒楂樺害" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HMouldHeight }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鎶樺彔楂樺害" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HMouldFoldHeight }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鏍囧噯鍖呰鏁伴噺" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HSNP }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍖呰瀹瑰櫒鏁伴噺" width="120">
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HMouldQty" :min="0" style="width: 90px;"
- controls-position="right"></el-input-number>
- </template>
- </el-table-column>
- <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>
- </template>
- </el-table-column>
- <el-table-column align="center" label="浣撶Н" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HVolume }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="闆跺崟鍗犵敤浣撶Н" width="120">
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HScatteredVolume" :min="0" style="width: 90px;"
- controls-position="right"></el-input-number>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
- <template slot-scope="scope">
- <el-button type="danger" icon="el-icon-delete" size="mini" circle
- @click="handleDeleteSysZb(scope.row)"></el-button>
- </template>
- </el-table-column>
- </el-table>
- </el-form>
- <!-- 鏁版嵁寮圭獥 -->
- <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
- <!-- 閮ㄩ棬 -->
- <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
- <!-- 浠撳簱 -->
- <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
- <!-- 鐗╂枡 -->
- <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
- <!-- 鍙戣揣閫氱煡鍗� -->
- <XsSeOutStockBill @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="xsSeOutStockBillShow" />
- <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
- <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
- <GyCartype @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCartypeShow" />
- <GyCar @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCarShow" />
- <GyDriver @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyDriverShow" />
- <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="openRowHide" width="816px" append-to-body>
- <RowSettings :colName="btResList" HModName="Kf_SellOutBillList" @rowEditClose="rowSetClose"
- v-if="rowHideShow" />
- </el-dialog>
+ <div v-loading="sourceDataLoading" element-loading-text="姝ｅ湪澶勭悊婧愬崟鏁版嵁锛岃绋嶅��..."
+ element-loading-spinner="el-icon-loading" element-loading-background="rgba(255, 255, 255, 0.8)">
+ <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+ <el-tabs v-model="activeName" type="card">
+ <el-tab-pane label="鍩烘湰淇℃伅" name="first">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+ <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏃ユ湡" prop="HDate">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡"
+ value-format="yyyy-MM-dd" disabled> </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="婧愬崟鍙�" prop="HMainSourceBillNo">
+ <el-input v-model="form.HMainSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞彿">
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(12)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鎵胯繍鍟�" prop="HCarrierName">
+ <el-input v-model="form.HCarrierName" placeholder="璇疯緭鍏ユ壙杩愬晢">
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(6)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瀹㈡埛" prop="HCusName">
+ <el-input v-model="form.HCusName" placeholder="璇疯緭鍏ュ鎴�">
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(7)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="濮嬪彂鍦�" prop="HBeginAddrName">
+ <el-input v-model="form.HBeginAddrName" placeholder="璇疯緭鍏ュ鍙戝湴">
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog('鏆傛棤')"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鐩殑鍦�" prop="HEndAddrName">
+ <el-input v-model="form.HEndAddrName" placeholder="璇疯緭鍏ョ洰鐨勫湴">
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog('鏆傛棤')"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="杞﹀瀷" prop="HCarTypeName">
+ <el-input v-model="form.HCarTypeName" placeholder="璇疯緭鍏ヨ溅鍨�">
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(13)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="杞﹀瀷鏈�澶у绉�" prop="HCarTypeMaxVolume">
+ <el-input v-model="form.HCarTypeMaxVolume" placeholder="璇疯緭鍏ヨ溅鍨嬫渶澶у绉�" readonly />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎵胯繍鍚堝悓" prop="HContractTransportBillNo">
+ <el-input v-model="form.HContractTransportBillNo" placeholder="璇疯緭鍏ユ壙杩愬悎鍚�">
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(16)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="璺濈锛堝叕閲岋級" prop="HDistance">
+ <el-input v-model="form.HDistance" placeholder="璇疯緭鍏ヨ窛绂�" readonly />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="杩愯緭鏃舵晥" prop="HTransportTimes">
+ <el-input v-model="form.HTransportTimes" placeholder="璇疯緭鍏ヨ繍杈撴椂鏁�" readonly />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="杩愯緭绫诲瀷" prop="HTransportTyep">
+ <el-input v-model="form.HTransportTyep" placeholder="璇疯緭鍏ヨ繍杈撶被鍨�" readonly />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="缁撶畻鏂瑰紡" prop="HSSName">
+ <el-input v-model="form.HSSName" placeholder="璇疯緭鍏ョ粨绠楁柟寮�">
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog('鏆傛棤')"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="甯佸埆" prop="HCurName">
+ <el-input v-model="form.HCurName" placeholder="璇疯緭鍏ュ竵鍒�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="姹囩巼" prop="HExRate">
+ <el-input v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" readonly />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="杩愯垂" prop="HMoney">
+ <el-input v-model="form.HMoney" placeholder="璇疯緭鍏ヨ繍璐�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎬讳綋绉紙绔嬫柟绫筹級" prop="HTotalVolume">
+ <el-input v-model="form.HTotalVolume" placeholder="璇疯緭鍏ユ�讳綋绉�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瑁呰浇鐜�" prop="HLoadingRate">
+ <el-input v-model="form.HLoadingRate" placeholder="璇疯緭鍏ヨ杞界巼" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鎻愯揣鍦板潃" prop="HPickAddr">
+ <el-input v-model="form.HPickAddr" placeholder="璇疯緭鍏ユ彁璐у湴鍧�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍒拌揣鍦板潃" prop="HArriverAddr">
+ <el-input v-model="form.HArriverAddr" placeholder="璇疯緭鍏ュ埌璐у湴鍧�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="杩愯緭鏂瑰紡" prop="HTransType">
+ <el-select v-model="form.HTransType" placeholder="璇烽�夋嫨杩愯緭鏂瑰紡">
+ <el-option label="闆跺崟" value="闆跺崟"></el-option>
+ <el-option label="鍗曠▼" value="鍗曠▼"></el-option>
+ <el-option label="寰�杩�" value="寰�杩�"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="缁勭粐" prop="HOrgID">
+ <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" @change="organizationChange"
+ disabled>
+ <el-option v-for="(item, index) in organizationList" :key="index"
+ :label="item.Name" :value="item.ID">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="瑕佹眰鎻愯揣鏃ユ湡" prop="HDateForRequestedPick">
+ <el-date-picker v-model="form.HDateForRequestedPick" type="date"
+ placeholder="閫夋嫨瑕佹眰鎻愯揣鏃ユ湡" value-format="yyyy-MM-dd">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎵胯繍鍟嗙‘璁ゆ棩鏈�" prop="HDate_CarrierSure">
+ <el-date-picker v-model="form.HDate_CarrierSure" type="date" placeholder="閫夋嫨鎵胯繍鍟嗙‘璁ゆ棩鏈�"
+ value-format="yyyy-MM-dd">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍒嗛厤鍙告満鏃ユ湡" prop="HDate_AllocationDriver">
+ <el-date-picker v-model="form.HDate_AllocationDriver" type="date"
+ placeholder="閫夋嫨鍒嗛厤鍙告満鏃ユ湡" value-format="yyyy-MM-dd">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瑕佹眰鍒拌揪鏃ユ湡" prop="HDataForRequestedArrived">
+ <el-date-picker v-model="form.HDataForRequestedArrived" type="date"
+ placeholder="閫夋嫨瑕佹眰鍒拌揪鏃ユ湡" value-format="yyyy-MM-dd">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鐗╂祦鐘舵��" prop="HCarryStatus">
+ <el-select v-model="form.HCarryStatus" placeholder="璇烽�夋嫨鐗╂祦鐘舵��">
+ <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-option label="宸插埌鍘�" value="5"></el-option>
+ <el-option label="宸叉彁璐�" value="6"></el-option>
+ <el-option label="杩愯緭涓�" value="7"></el-option>
+ <el-option label="宸茬鏀�" value="8"></el-option>
+ <el-option label="宸叉牳绠�" value="9"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="杞﹁締" prop="HCarName">
+ <el-input v-model="form.HCarName" placeholder="璇疯緭鍏ヨ溅杈�">
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(14)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍙告満" prop="HDriverName">
+ <el-input v-model="form.HDriverName" placeholder="璇疯緭鍏ュ徃鏈�">
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(15)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-tab-pane>
+ <!-- <el-tab-pane label="闄勪欢淇℃伅" name="second">
+ <div style="padding: 10px;">
+ <el-upload class="upload-demo" ref="upload" action="" :on-change="handleFileChange"
+ :show-file-list="false" :on-remove="handleFileRemove" :file-list="uploadFiles"
+ :auto-upload="false" multiple>
+ <el-button slot="trigger" size="small" type="primary">閫夋嫨鏂囦欢</el-button>
+ <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload"
+ :loading="uploadLoading">涓婁紶鏂囦欢</el-button>
+ </el-upload>
+ <el-table :data="uploadFiles" style="width: 100%" border>
+ <el-table-column prop="name" label="鏂囦欢鍚�">
+ </el-table-column>
+ <el-table-column prop="type" label="鏂囦欢绫诲瀷">
+ <template slot-scope="scope">
+ {{ scope.row.name.substring(scope.row.name.lastIndexOf('.') + 1).toLowerCase()
+ }}
+ </template>
+</el-table-column>
+<el-table-column prop="size" label="澶у皬">
+ <template slot-scope="scope">
+ {{ (scope.row.size / 1024).toFixed(1) + ' KB' }}
+ </template>
+</el-table-column>
+<el-table-column prop="status" label="鐘舵��">
+ <template slot-scope="scope">
+ <span v-if="scope.row.status == 'ready'">鏈笂浼�</span>
+ </template>
+</el-table-column>
+<el-table-column label="鎿嶄綔" width="180">
+ <template slot-scope="scope">
+ <el-button size="mini" type="primary"
+ @click="flieUpload(scope.row)">涓婁紶</el-button>
+ <el-button size="mini" type="danger" @click="deleteFile(index)">鍒犻櫎</el-button>
+ </template>
+</el-table-column>
+</el-table>
+</div>
+</el-tab-pane> -->
+ <el-tab-pane label="鍒跺崟淇℃伅" name="third">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍒跺崟浜�" prop="HMaker">
+ <el-input v-model="form.HMaker" placeholder="璇疯緭鍏ュ埗鍗曚汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="淇敼浜�" prop="HUpDater">
+ <el-input v-model="form.HUpDater" placeholder="璇疯緭鍏ヤ慨鏀逛汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瀹℃牳浜�" prop="HChecker">
+ <el-input v-model="form.HChecker" placeholder="璇疯緭鍏ュ鏍镐汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍏抽棴浜�" prop="HCloseMan">
+ <el-input v-model="form.HCloseMan" placeholder="璇疯緭鍏ュ叧闂汉" disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍒跺崟鏃ユ湡" prop="HMakeDate">
+ <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="淇敼鏃ユ湡" prop="HUpDateDate">
+ <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+ disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckDate">
+ <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍏抽棴鏃ユ湡" prop="HCloseDate">
+ <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="浣滃簾浜�" prop="HDeleteMan">
+ <el-input v-model="form.HDeleteMan" placeholder="璇疯緭鍏ヤ綔搴熶汉" disabled />
+ </el-form-item>
+
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="浣滃簾鏃ユ湡" prop="HDeleteDate">
+ <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡"
+ disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍒板巶纭浜�" prop="HSurer_Arrive">
+ <el-input v-model="form.HSurer_Arrive" placeholder="璇疯緭鍏ュ埌鍘傜‘璁や汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍒板巶纭鏃堕棿" prop="HDate_Arrive">
+ <el-date-picker v-model="form.HDate_Arrive" type="date" placeholder="閫夋嫨鍒板巶纭鏃堕棿"
+ disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎻愯揣纭浜�" prop="HSurer_Pick">
+ <el-input v-model="form.HSurer_Pick" placeholder="璇疯緭鍏ユ彁璐х‘璁�" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎻愯揣纭鏃堕棿" prop="HDate_Pick">
+ <el-date-picker v-model="form.HDate_Pick" type="date" placeholder="閫夋嫨鎻愯揣纭鏃堕棿"
+ disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍑哄巶杩愯緭纭浜�" prop="HSurer_Trans">
+ <el-input v-model="form.HSurer_Trans" placeholder="璇疯緭鍏ュ埌鍘傜‘璁や汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍑哄巶杩愯緭纭鏃堕棿" prop="HDate_Trans">
+ <el-date-picker v-model="form.HDate_Trans" type="date" placeholder="閫夋嫨鍒板嚭鍘傝繍杈撶‘璁ゆ椂闂�"
+ disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="绛炬敹纭浜�" prop="HSurer_Receive">
+ <el-input v-model="form.HSurer_Receive" placeholder="璇疯緭鍏ョ鏀剁‘璁や汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="绛炬敹纭鏃堕棿" prop="HDate_Receive">
+ <el-date-picker v-model="form.HDate_Receive" type="date" placeholder="閫夋嫨绛炬敹纭鏃堕棿"
+ disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鏍哥畻浜�" prop="HSurer_Accounting">
+ <el-input v-model="form.HSurer_Accounting" placeholder="璇疯緭鍏ユ牳绠椾汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏍哥畻鏃堕棿" prop="HDate_Accounting">
+ <el-date-picker v-model="form.HDate_Accounting" type="date" placeholder="閫夋嫨鏍哥畻鏃堕棿"
+ disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-tab-pane>
+ </el-tabs>
+ <el-card class="box-card">
+ <div slot="header" class="clearfix">
+ <span>妫�楠岄」淇℃伅</span>
+ </div>
+ <div>
+ <div style="margin-bottom: 10px;">
+ <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow"
+ size="mini">澶嶅埗涓�琛�</el-button>
+ </div>
+ <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
+ @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">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSourceBillNo }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鐗╂枡浠ｇ爜" width="120">
+ <template slot-scope="scope">{{ scope.row.HMaterNumber }} </template>
+ </el-table-column>
+ <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
+ <template slot-scope="scope">{{ scope.row.HMaterName }} </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍣ㄥ叿浠ｇ爜" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HMouldNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍣ㄥ叿鍚嶇О" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMouldName }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瀹瑰櫒闀垮害" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMouldLength }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瀹瑰櫒瀹藉害" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMouldWidth }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瀹瑰櫒楂樺害" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMouldHeight }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎶樺彔楂樺害" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HMouldFoldHeight }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鏍囧噯鍖呰鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HSNP }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍖呰瀹瑰櫒鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.HMouldQty" :min="0" style="width: 90px;"
+ controls-position="right"></el-input-number>
+ </template>
+ </el-table-column>
+ <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>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="浣撶Н" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HVolume }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="闆跺崟鍗犵敤浣撶Н" width="120">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.HScatteredVolume" :min="0" style="width: 90px;"
+ controls-position="right"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
+ <template slot-scope="scope">
+ <el-button type="danger" icon="el-icon-delete" size="mini" circle
+ @click="handleDeleteSysZb(scope.row)"></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-card>
+ </el-form>
+ <!-- 鏁版嵁寮圭獥 -->
+ <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
+ <!-- 閮ㄩ棬 -->
+ <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="deptShow" />
+ <!-- 浠撳簱 -->
+ <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="warehouseShow" />
+ <!-- 鐗╂枡 -->
+ <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="materialShow" />
+ <!-- 鍙戣揣閫氱煡鍗� -->
+ <XsSeOutStockBill @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName"
+ :propsHOrgID="form.HOrgID" v-if="xsSeOutStockBillShow" />
+ <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
+ <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
+ <GyCartype @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCartypeShow" />
+ <GyCar @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCarShow" />
+ <GyDriver @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyDriverShow" />
+ <ContractTransport @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName"
+ v-if="ContractTransportShow" />
+ <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="openRowHide" width="816px" append-to-body>
+ <RowSettings :colName="btResList" HModName="Kf_SellOutBillList" @rowEditClose="rowSetClose"
+ v-if="rowHideShow" />
+ </el-dialog>
+ </div>
</div>
</template>
@@ -442,9 +544,10 @@
import GyCartype from "@/views/basic/gyCartypelist/gyCartypelist.vue"
import GyCar from "@/views/basic/gyCar/gyCarList.vue"
import GyDriver from "@/views/system/user/GyDriver.vue"
+import ContractTransport from "@/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue"
export default {
name: 'SellOutBill',
- components: { Dept, Warehouse, Material, RowSettings, XsSeOutStockBill, GyCustomer, GySupplier, GyCartype, GyCar, GyDriver },
+ components: { Dept, Warehouse, Material, RowSettings, XsSeOutStockBill, GyCustomer, GySupplier, GyCartype, GyCar, GyDriver, ContractTransport },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -465,6 +568,7 @@
formShow: false, //琛ㄥ崟鏄惁鏄剧ず鏍囪
formLoading: true, //琛ㄥ崟鍔犺浇閬僵
+ sourceDataLoading: false, //婧愬崟鏁版嵁澶勭悊鍔犺浇閬僵
zzSelDis: false, //缁勭粐涓嬫媺鍒楄〃绂佺敤鏍囪
rowHideShow: false, //鍒楄缃粍浠跺鍣ㄦ樉绀烘爣璁�
@@ -483,6 +587,7 @@
gyCartypeShow: false, //杞﹀瀷鏁版嵁缁勪欢鏄剧ず鏍囪
gyCarShow: false, //杞﹁締鏁版嵁缁勪欢鏄剧ず鏍囪
gyDriverShow: false, //鍙告満鏁版嵁缁勪欢鏄剧ず鏍囪
+ ContractTransportShow: false, //鎵胯繍鍚堝悓鏁版嵁缁勪欢鏄剧ず鏍囪
deptform: {}, //寮圭獥閫変腑鏁版嵁
temp: undefined, //涓存椂鍙橀噺
@@ -490,7 +595,7 @@
form: {}, // 琛ㄥ崟鍙傛暟
rules: { // 琛ㄥ崟鏍￠獙
HCarrierName: [
- { required: true, message: "鎵胯繍鍟嗕笉鑳戒负绌�", trigger: "blur" }
+ { required: true, message: "鎵胯繍鍟嗕笉鑳戒负绌�", trigger: "change" }
],
HCusName: [
{ required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
@@ -544,11 +649,15 @@
single: true, // 闈炲崟涓鐢�
multiple: true, // 闈炲涓鐢�
+ // 闄勪欢涓婁紶鐩稿叧鏁版嵁
+ fileList: [], // 宸蹭笂浼犳枃浠跺垪琛�
+ uploadFiles: [], // 寰呬笂浼犳枃浠跺垪琛�
+ uploadLoading: false, // 涓婁紶鍔犺浇鐘舵��
+ uploadUrl: '', // 涓婁紶鎺ュ彛鍦板潃
};
},
created() {
- this.fetchData()
this.getdata()
},
beforeDestroy() {
@@ -560,7 +669,6 @@
getdata() {
this.formShow = false
this.formLoading = true
-
if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
this.handleAdd()
}
@@ -686,55 +794,69 @@
this.form = {
HInterID: 0,
HBillNo: "",
- HDate: new Date(),
- HEmpID: 0,
- HEmpName: "",
- HDeptID: 0,
- HDeptName: "",
- HSupID: 0,
- HSupName: "",
- HInvoiceBillNo: "",
- HWHID: 0,
- HWHName: "",
- HSecManagerID: 0,
- HSecManagerName: "",
- HRemark: "",
+ HDate: moment(new Date()).format('YYYY-MM-DD'),
HOrgID: sessionStorage["OrganizationID"] - 0,
HMaker: sessionStorage["HUserName"],
HChecker: "",
HCloseMan: "",
HUpDater: "",
HDeleteMan: "",
- HMakeDate: "",//new Date().format("yyyy-MM-dd hh:mm:ss"),
+ HMakeDate: "",
HCheckDate: "",
HCloseDate: "",
HUpDateDate: "",
HDeleteDate: "",
- BillType: '1402',
- HBillSubType: '1205',
- HSTOCKORGID: sessionStorage["OrganizationID"] - 0,//缁勭粐id
- HOWNERID: sessionStorage["OrganizationID"] - 0,
-
-
- HManagerID: 0,
- HManagerName: "",
- HKeeperID: 0,
- HKeeperName: "",
- HProjectID: 0,
- HProjectNumber: "",
- HProjectName: "",
-
-
- HCurID: 0,
- HCurName: '',
- HExRate: 1,
- HSourceBillType: "",
+ HExRate: 0,
HMainSourceInterID: 0,
HMainSourceEntryID: 0,
HMainSourceBillType: '',
HMainSourceBillNo: '',
- HExplanation: "",
HInnerBillNo: "",
+
+ HCarrierID: 0,
+ HCarrierName: "",
+ HCusID: 0,
+ HCusName: "",
+ HBeginAddr: 0,
+ HBeginAddrName: "",
+ HEndAddr: 0,
+ HEndAddrName: "",
+ HPickAddr: "",
+ HArriverAddr: "",
+ HTransType: "",
+ HCarTypeID: 0,
+ HCarTypeName: "",
+ HCarTypeMaxVolume: 0,
+ HTotalVolume: 0,
+ HLoadingRate: 0,
+ HContractTransportInterID: 0,
+ HContractTransportEntryID: 0,
+ HContractTransportBillNo: "",
+ HDistance: 0,
+ HTransportTimes: "",
+ HTransportTyep: "",
+ HSSID: 0,
+ HSSName: "",
+ HMoney: 0,
+ HDateForRequestedPick: "",
+ HDataForRequestedArrived: "",
+ HCarryStatus: "0",
+ HDate_CarrierSure: "",
+ HDate_AllocationDriver: "",
+ HCarID: 0,
+ HCarName: "",
+ HDriverID: 0,
+ HDriverName: "",
+ HSurer_Arrive: "",
+ HDate_Arrive: "",
+ HSurer_Pick: "",
+ HDate_Pick: "",
+ HSurer_Trans: "",
+ HDate_Trans: "",
+ HSurer_Receive: "",
+ HDate_Receive: "",
+ HSurer_Accounting: "",
+ HDate_Accounting: "",
}
this.editData = []
this.editBtData = []
@@ -752,9 +874,6 @@
this.reset()
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
- if (this.OperationType == 1) {
- this.handleAddSysZb()
- }
this.$nextTick(() => {
this.formShow = true
this.formLoading = false
@@ -769,103 +888,125 @@
axios.get(this.$baseUrl + "/Kf_POStockInBill/cx", {
params: { 'HInterID': rowHmainid }
}).then(response => {
- if (response.data.count == 1) {
- var result = response.data
- var data = response.data.data[0]
- this.form.BillType = data.HSourceBillType
+ console.log(response.data.data.h_v_WL_YayBillEdit)
+ if (response.data.code == 1) {
+ var result = { data: response.data.data.h_v_WL_YayBillEdit }
+ var data = response.data.data.h_v_WL_YayBillEdit[0]
if (this.copyType == 1) {
this.getHBillNo()
- }
- else {
- this.form.HInterID = data.hmainid
+ } else {
+ this.form.HInterID = this.linterid.toString()
this.form.HBillNo = data.鍗曟嵁鍙�
- this.form.HDate = data.鏃ユ湡
+ this.form.HDate = data.鏃ユ湡 //moment(data.鏃ユ湡moment).format('YYYY-MM-DD')
this.form.HMaker = data.鍒跺崟浜�
this.form.HUpDater = data.淇敼浜�
this.form.HChecker = data.瀹℃牳浜�
- this.form.HMakeDate = data.鍒跺崟鏃ユ湡
- this.form.HUpDateDate = data.淇敼鏃ユ湡
- this.form.HCheckDate = data.瀹℃牳鏃ユ湡
+ this.form.HMakeDate = data.鍒跺崟鏃ユ湡 == null ? "" : moment(data.鍒跺崟鏃ユ湡).format('YYYY-MM-DD')
+ this.form.HUpDateDate = data.淇敼鏃ユ湡 == null ? "" : moment(data.淇敼鏃ユ湡).format('YYYY-MM-DD')
+ this.form.HCheckDate = data.瀹℃牳鏃ユ湡 == null ? "" : moment(data.瀹℃牳鏃ユ湡).format('YYYY-MM-DD')
this.form.HCloseMan = data.鍏抽棴浜�
this.form.HDeleteMan = data.浣滃簾浜�
- this.form.HCloseDate = data.鍏抽棴鏃ユ湡
- this.form.HDeleteDate = data.浣滃簾鏃ユ湡
+ this.form.HCloseDate = data.鍏抽棴鏃ユ湡 == null ? "" : moment(data.鍏抽棴鏃ユ湡).format('YYYY-MM-DD')
+ this.form.HDeleteDate = data.浣滃簾鏃ユ湡 == null ? "" : moment(data.浣滃簾鏃ユ湡).format('YYYY-MM-DD')
+ this.form.HSurer_Arrive = data.鍒板巶纭浜�
+ this.form.HDate_Arrive = data.鍒板巶纭鏃堕棿
+ this.form.HSurer_Pick = data.鎻愯揣纭浜�
+ this.form.HDate_Pick = data.鎻愯揣纭鏃堕棿
+ this.form.HSurer_Trans = data.鍑哄巶杩愯緭纭浜�
+ this.form.HDate_Trans = data.鍑哄巶杩愯緭纭鏃堕棿
+ this.form.HSurer_Receive = data.绛炬敹纭浜�
+ this.form.HDate_Receive = data.绛炬敹纭鏃堕棿
+ this.form.HSurer_Accounting = data.鏍哥畻浜�
+ this.form.HDate_Accounting = data.鏍哥畻鏃堕棿
}
- this.form.HEmpID = data.HEmpID
- this.form.HEmpName = data.涓氬姟鍛�
- this.form.HDeptID = data.HDeptID
- this.form.HDeptName = data.閮ㄩ棬
- this.form.HSupID = data.HSupID
- this.form.HSupName = data.渚涘簲鍟�
- this.form.HInvoiceBillNo = data.鍙戠エ缂栧彿
- this.form.HWHID = data.涓昏〃浠撳簱ID
- this.form.HWHName = data.涓昏〃浠撳簱
- this.form.HSecManagerID = data.HSecManagerID
- this.form.HSecManagerName = data.楠屾敹鍛�
- this.form.HRemark = data.琛ㄥご澶囨敞
- this.form.HOrgID = data.HOrgID
- this.form.HSTOCKORGID = data.HOrgID
- this.form.HOWNERID = data.HOrgID
-
- this.form.HKeeperID = data.HKeeperID
- this.form.HKeeperName = data.淇濈鍛�
- this.form.HSourceBillType = data.婧愬崟绫诲瀷
- this.form.HManagerID = data.HManagerID
- this.form.HManagerName = data.璐熻矗浜�
- this.form.HExRate = data.姹囩巼
- this.form.HProjectID = data.HProjectID
- this.form.HProjectNumber = data.椤圭洰浠ｇ爜
- this.form.HProjectName = data.椤圭洰鍚嶇О
- this.form.HCurID = data.HCurID
- this.form.HCurName = data.甯佸埆
- this.form.HExRate = data.姹囩巼
- this.form.HBillSubType = data.HBillSubType
+ this.form.HOrgID = data.HOrgID.toString()
+ this.form.HExRate = !data.姹囩巼 ? 0 : data.姹囩巼
this.form.HMainSourceInterID = data.HMainSourceInterID
this.form.HMainSourceEntryID = data.HMainSourceEntryID
this.form.HMainSourceBillType = data.HMainSourceBillType
this.form.HMainSourceBillNo = data.HMainSourceBillNo
- this.form.HExplanation = data.鎽樿
this.form.HInnerBillNo = data.鍐呴儴鍗曟嵁鍙�
+ this.form.HCarrierID = data.鎵胯繍鍟咺D
+ this.form.HCarrierName = data.鎵胯繍鍟嗗悕绉�
+ this.form.HCusID = data.HCusID
+ this.form.HCusName = data.瀹㈡埛鍚嶇О
+ this.form.HBeginAddr = data.濮嬪彂鍦�
+ this.form.HBeginAddrName = data.濮嬪彂鍦板悕绉�
+ this.form.HEndAddr = data.鐩殑鍦�
+ this.form.HEndAddrName = data.鐩殑鍦板悕绉�
+ this.form.HPickAddr = data.鎻愯揣鍦板潃
+ this.form.HArriverAddr = data.鍒拌揣鏂瑰紡
+ this.form.HTransType = data.杩愯緭鏂瑰紡
+ this.form.HCarTypeID = data.杞﹀瀷ID
+ this.form.HCarTypeName = data.杞﹀瀷鍚嶇О
+ this.form.HCarTypeMaxVolume = data.杞﹀瀷鏈�澶у绉�
+ this.form.HTotalVolume = data.鎬讳綋绉�
+ this.form.HLoadingRate = data.瑁呰浇鐜�
+ this.form.HContractTransportInterID = data.鎵胯繍鍚堝悓ID
+ this.form.HContractTransportEntryID = data.鎵胯繍鍚堝悓瀛怚D
+ this.form.HContractTransportBillNo = data.鎵胯繍鍚堝悓鍗曟嵁鍙�
+ this.form.HDistance = data.璺濈
+ this.form.HTransportTimes = data.杩愯緭鏃舵晥
+ this.form.HTransportTyep = data.杩愯緭绫诲瀷
+ this.form.HSSID = data.缁撶畻鏂瑰紡
+ this.form.HSSName = data.缁撶畻鏂瑰紡鍚嶇О
+ this.form.HCurID = data.甯佸埆
+ this.form.HCurName = data.甯佸埆鍚嶇О
+ this.form.HMoney = data.杩愯緭璐圭敤
+ this.form.HDateForRequestedPick = data.瑕佹眰鎻愯揣鏃堕棿
+ this.form.HDataForRequestedArrived = data.瑕佹眰鍒拌揣鏃堕棿
+ this.form.HCarryStatus = data.鐗╂祦鐘舵��
+ this.form.HDate_CarrierSure = data.鎵胯繍鍟嗙‘璁ゆ椂闂�
+ this.form.HDate_AllocationDriver = data.鍒嗛厤鍙告満鏃堕棿
+ this.form.HCarID = data.杞﹁締ID
+ this.form.HCarName = data.杞﹁締鍚嶇О
+ this.form.HDriverID = data.鍙告満ID
+ this.form.HDriverName = data.鍙告満鍚嶇О
//瀛愯〃 璧嬪��
for (var i = 0; i < result.data.length; i++) {
+ var qty = parseFloat(result.data[i].HQty) || 0;
+ var snp = parseFloat(result.data[i].鏍囧噯鍖呰鏁伴噺) || 1;
+ var mouldQty = Math.ceil(qty / snp);
+
+ var length = parseFloat(result.data[i].瀹瑰櫒闀垮害) || 0;
+ var width = parseFloat(result.data[i].瀹瑰櫒瀹藉害) || 0;
+ var height = parseFloat(result.data[i].瀹瑰櫒楂樺害) || 0;
+ var rowVolume = (length * width * height).toFixed(2);
+
this.editData.push(
{
- "HMaterID": result.data[i].HMaterID
- , "鐗╂枡浠ｇ爜": result.data[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
- , "HUnitID": result.data[i].HUnitID
- , "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅
- , "HQtyMust": result.data[i].搴旀敹鏁伴噺
- , "HQty": result.data[i].瀹炴敹鏁伴噺
- , "HRemark": result.data[i].琛ㄤ綋澶囨敞
- , "HPrice": result.data[i].鍗曚环
- , "HMoney": result.data[i].閲戦
- , "HOrderPrice": result.data[i].閲囪喘閲戦
- , "HWHID": result.data[i].HWHID
- , "鏀舵枡浠撳簱": result.data[i].鏀舵枡浠撳簱
- , "HSPID": result.data[i].HSPID
- , "浠撲綅鍚嶇О": result.data[i].浠撲綅鍚嶇О
- , "HBatchNo": result.data[i].鎵规
- , "HSourceBillNo": result.data[i].婧愬崟鍗曞彿 //婧愬崟鍙�
- , "HSourceBillType": result.data[i].婧愬崟绫诲瀷 //婧愬崟绫诲瀷
- , "HSourceInterID": result.data[i].婧愬崟涓诲唴鐮� //婧愬崟涓诲唴鐮�
- , "HSourceEntryID": result.data[i].婧愬崟瀛愬唴鐮� //婧愬崟瀛愬唴鐮�
- , "HTaxRate": result.data[i].绋庣巼
- , "HTaxPrice": result.data[i].鍚◣鍗曚环
- , "HlineTotal": result.data[i].鍚◣閲戦
+ "HSourceInterID": result.data[i].婧愬崟涓诲唴鐮�,
+ "HSourceEntryID": result.data[i].婧愬崟瀛愬唴鐮�,
+ "HSourceBillNo": result.data[i].婧愬崟鍗曟嵁,
+ "HMaterID": result.data[i].HMaterID,
+ "HMaterNumber": result.data[i].鐗╂枡浠ｇ爜,
+ "HMaterName": result.data[i].鐗╂枡鍚嶇О,
+ "HUnitID": result.data[i].HUnitID,
+ "HMouldID": result.data[i].HMouldID,
+ "HMouldNumber": result.data[i].鍣ㄥ叿鍙�,
+ "HMouldName": result.data[i].鍣ㄥ叿鍚嶇О,
+ "HMouldLength": result.data[i].瀹瑰櫒闀垮害,
+ "HMouldWidth": result.data[i].瀹瑰櫒瀹藉害,
+ "HMouldHeight": result.data[i].瀹瑰櫒楂樺害,
+ "HMouldFoldHeight": result.data[i].瀹瑰櫒鎶樺彔楂樺害,
+ "HSNP": result.data[i].鏍囧噯鍖呰鏁伴噺,
+ "HMouldQty": result.data[i].鍖呰瀹瑰櫒鏁伴噺,
+ "HQty": result.data[i].鐗╂枡鏁伴噺,
+ "HQty_origin": result.data[i].HQty,
+ "HVolume": rowVolume,
+ "HScatteredVolume": result.data[i].闆跺崟鍗犵敤浣撶Н
}
)
- }
-
- if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
- this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
- this.subDisabled = true
}
this.formShow = true
this.formLoading = false
+ // 鍔犺浇宸蹭笂浼犵殑鏂囦欢鍒楄〃
+ this.getFileList();
+
+ } else {
+ this.$modal.msgError(response.data.msg);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
@@ -940,8 +1081,11 @@
this.dialogTitle = '杞﹁締鍒楄〃'
this.gyDriverShow = true
this.openData = true
+ } else if (num == 16) {
+ this.dialogTitle = '鎵胯繍鍚堝悓鍒楄〃'
+ this.ContractTransportShow = true
+ this.openData = true
}
-
},
//#region 灏嗘暟鎹脊绐楀叏閮ㄥ彇娑堝姞杞�
showReset() {
@@ -954,6 +1098,7 @@
this.gyCartypeShow = false
this.gyCarShow = false
this.gyDriverShow = false
+ this.ContractTransportShow = false
},
//#endregion
//#endregion
@@ -966,18 +1111,15 @@
this.form.HEmpID = deptRow.HEmpID
this.form.HManagerName = deptRow.璐熻矗浜�
this.openData = false
- }
- else if (num == 2) { //鏀舵枡浠撳簱
+ } else if (num == 2) { //鏀舵枡浠撳簱
this.editData[this.zbIndex].HWHID = deptRow.HItemID;
this.editData[this.zbIndex].鏀舵枡浠撳簱 = deptRow.浠撳簱鍚嶇О;
this.openData = false
- }
- else if (num == 4) { //浠撲綅
+ } else if (num == 4) { //浠撲綅
this.editData[this.zbIndex].HSPID = deptRow.HItemID;
this.editData[this.zbIndex].浠撲綅鍚嶇О = deptRow.浠撲綅鍚嶇О;
this.openData = false
- }
- else if (num == 3) { //鐗╂枡
+ } else if (num == 3) { //鐗╂枡
this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜;
this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
@@ -988,7 +1130,6 @@
this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼
this.openData = false
} else if (num == 6) {
- console.log(deptRow)
this.form.HCarrierName = deptRow.渚涘簲鍟嗗悕绉�
this.form.HCarrierID = deptRow.HItemID
this.gySupplierShow = false
@@ -999,8 +1140,8 @@
this.gyCustomerShow = false
this.openData = false
} else if (num == 12) {
- this.xsSeOutStockBillShow = false
- this.openData = false
+ // 浣跨敤寮傛鏂瑰紡澶勭悊婧愬崟鏁版嵁
+ this.processSourceDataAsync(deptRow);
} else if (num == 13) {
this.form.HCarTypeName = deptRow.杞﹀瀷鍚嶇О
this.form.HCarTypeID = deptRow.HItemID
@@ -1017,6 +1158,23 @@
this.form.HDriverName = deptRow.椹鹃┒鍛樺悕绉�
this.form.HDriverID = deptRow.HItemID
this.gyDriverShow = false
+ this.openData = false
+ } else if (num == 16) {
+ this.form.HContractTransportBillNo = deptRow.鍗曟嵁鍙�
+ this.form.HContractTransportInterID = deptRow.HInterID
+ this.form.HContractTransportEntryID = deptRow.HInterID
+ this.form.HDistance = deptRow.璺濈
+ this.form.HTransportTimes = deptRow.杩愯緭鏃舵晥
+ this.form.HTransportTyep = deptRow.杩愯緭绫诲瀷
+ this.form.HSSID = deptRow.缁撶畻鏂瑰紡
+ this.form.HSSName = deptRow.缁撶畻鏂瑰紡鍚嶇О
+ this.form.HCurID = deptRow.甯佸埆
+ this.form.HCurName = deptRow.甯佸埆鍚嶇О
+ this.form.HMoney = deptRow.杩愯緭璐圭敤
+ this.form.HExRate = deptRow.姹囩巼 == null ? 0 : deptRow.姹囩巼
+ this.form.HCarrierID = deptRow.HSupID
+ this.form.HCarrierName = deptRow.渚涘簲鍟嗗悕绉�
+ this.ContractTransportShow = false
this.openData = false
}
},
@@ -1043,7 +1201,267 @@
},
//#endregion
//#endregion
+ //#region 妫�鏌ユ簮鍗曟槸鍚﹀凡缁忓湪瀛愯〃涓瓨鍦�
+ checkDuplicateSource(newSourceData) {
+ // 鑾峰彇褰撳墠瀛愯〃鏁版嵁
+ var currentTableData = this.editData || [];
+ // 閬嶅巻鏂伴�夋嫨鐨勬簮鍗曟暟鎹�
+ for (var i = 0; i < newSourceData.length; i++) {
+ var newSourceInterID = newSourceData[i].hmainid;
+ var newSourceEntryID = newSourceData[i].hsubid;
+
+ // 妫�鏌ユ槸鍚﹀凡缁忓湪褰撳墠瀛愯〃涓瓨鍦�
+ for (var j = 0; j < currentTableData.length; j++) {
+ var existingSourceInterID = currentTableData[j].HSourceInterID;
+ var existingSourceEntryID = currentTableData[j].HSourceEntryID;
+
+ // 濡傛灉涓诲唴鐮佸拰瀛愬唴鐮侀兘鐩稿悓锛屽垯璇存槑宸插瓨鍦�
+ if (existingSourceInterID == newSourceInterID &&
+ existingSourceEntryID == newSourceEntryID) {
+ return true; // 瀛樺湪閲嶅
+ }
+ }
+ }
+ return false; // 鏃犻噸澶�
+ },
+ //#endregion
+
+ //#region 寮傛澶勭悊婧愬崟鏁版嵁
+ async processSourceDataAsync(deptRow) {
+ try {
+ // 璁剧疆瀹㈡埛淇℃伅
+ if (!this.form.HCusID && deptRow.length > 0) {
+ this.form.HCusID = deptRow[0]["HCusID"];
+ this.form.HCusName = deptRow[0]["瀹㈡埛"];
+ }
+ console.log(deptRow)
+ this.form.HMainSourceInterID=deptRow[0]["hmainid"]
+ this.form.HMainSourceEntryID=deptRow[0]["hsubid"]
+ this.form.HMainSourceBillType=deptRow[0]["HBillType"]
+ this.form.HMainSourceBillNo=deptRow[0]["鍗曟嵁鍙�"]
+ // 妫�鏌ユ槸鍚︽墍鏈夎褰曞睘浜庡悓涓�瀹㈡埛
+ for (var i = 0; i < deptRow.length; i++) {
+ if (deptRow[i]["HCusID"] != this.form.HCusID) {
+ this.$modal.msgError("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛锛岃纭繚閫夋嫨鐨勬簮鍗曞睘浜庡悓涓�瀹㈡埛!");
+ this.xsSeOutStockBillShow = false;
+ this.openData = false;
+ return;
+ }
+ }
+
+ // 妫�鏌ユ柊閫夋嫨鐨勬簮鍗曟槸鍚﹀凡缁忓湪瀛愯〃涓瓨鍦�
+ var isDuplicate = this.checkDuplicateSource(deptRow);
+ if (isDuplicate) {
+ this.$modal.msgError("閫夋嫨鐨勬簮鍗曚腑宸插瓨鍦ㄩ噸澶嶈褰曪紝璇峰嬁閲嶅閫夋嫨鐩稿悓鐨勬簮鍗�!");
+ this.xsSeOutStockBillShow = false;
+ this.openData = false;
+ return;
+ }
+
+ // 寮傛澶勭悊婧愬崟鏁版嵁
+ await this.appendInitBySeOutStockBill(deptRow);
+
+ // 鍏抽棴瀵硅瘽妗�
+ this.xsSeOutStockBillShow = false;
+ this.openData = false;
+ } catch (error) {
+ console.error("澶勭悊婧愬崟鏁版嵁鏃跺彂鐢熼敊璇�:", error);
+ this.$modal.msgError("澶勭悊婧愬崟鏁版嵁鏃跺彂鐢熼敊璇紝璇风◢鍚庨噸璇�!");
+ this.xsSeOutStockBillShow = false;
+ this.openData = false;
+ }
+ },
+ //#endregion
+
+ //#region 閫夋嫨婧愬崟-鍙戣揣閫氱煡鍗曪紙杩藉姞鏂瑰紡锛�
+ //鏀逛负寮傛鏂规硶锛屼紭鍖栨簮鍗曟暟鎹鐞嗛�昏緫
+ async appendInitBySeOutStockBill(checkStatus) {
+ try {
+ // 鏄剧ず婧愬崟鏁版嵁鍔犺浇鐘舵��
+ this.sourceDataLoading = true;
+
+ var dataArray = [];
+
+ // 浣跨敤Promise.all绛夊緟鎵�鏈夊紓姝ヨ姹傚畬鎴�
+ const promises = checkStatus.map(async (item) => {
+ const temp = await this.getPushSeOutStockBillInit(item.hmainid, item.hsubid);
+ return temp;
+ });
+
+ const results = await Promise.all(promises);
+
+ // 杩囨护鎺塶ull鍊�
+ for (const result of results) {
+ if (result) {
+ dataArray.push(result);
+ } else {
+ // 濡傛灉鏈変换浣曡姹傚け璐ワ紝缁堟澶勭悊
+ this.sourceDataLoading = false;
+ return;
+ }
+ }
+
+ // 鑾峰彇鐜版湁瀛愯〃鏁版嵁
+ var existingData = this.editData || [];
+ var orginHQTY = 0;
+
+ // 鍒涘缓鐗╂枡ID鏄犲皠
+ var materialMap = {};
+ for (var i = 0; i < dataArray.length; i++) {
+ orginHQTY = dataArray[i].鏁伴噺;
+ var materialId = dataArray[i].HMaterID;
+ if (!materialMap[materialId]) {
+ materialMap[materialId] = [];
+ }
+ materialMap[materialId].push({
+ hmainid: dataArray[i].hmainid,
+ hsubid: dataArray[i].hsubid,
+ 鍗曟嵁鍙�: dataArray[i].鍗曟嵁鍙�
+ });
+ }
+
+ // 鑾峰彇鎵�鏈夌墿鏂橧D
+ var ListMaterial = "";
+ for (var materialId in materialMap) {
+ if (ListMaterial) ListMaterial += ";";
+ ListMaterial += materialId;
+ }
+
+ if (!ListMaterial) {
+ this.$modal.msgError("娌℃湁鎵惧埌鐗╂枡淇℃伅锛岃妫�鏌ラ�夋嫨鐨勬簮鍗曟槸鍚﹀寘鍚湁鏁堢殑鐗╂枡鏁版嵁!");
+ this.sourceDataLoading = false;
+ return;
+ }
+
+ const response = await axios.get(this.baseURL + '/WLYayBillController/GetMesByOrginBill', {
+ params: {
+ "ListMaterial": ListMaterial
+ },
+ });
+
+ let result = response.data;
+ if (result.count == 1) {
+ let res = result.data;
+ var newRows = [];
+
+ // 涓烘瘡涓簮鍗曡鍒涘缓瀵瑰簲鐨勫瓙琛ㄨ
+ for (var materialId in materialMap) {
+ var sourceInfos = materialMap[materialId];
+
+ // 鏌ユ壘璇ョ墿鏂橧D瀵瑰簲鐨勫寘瑁呭鍣ㄤ俊鎭�
+ var materialInfo = null;
+ for (var i = 0; i < res.length; i++) {
+ if (res[i].HMaterID == materialId) {
+ materialInfo = res[i];
+ break;
+ }
+ }
+
+ if (materialInfo) {
+ // 涓烘瘡涓簮鍗曡鍒涘缓涓�鏉¤褰�
+ for (var j = 0; j < sourceInfos.length; j++) {
+ var sourceInfo = sourceInfos[j];
+
+ // 鍐嶆妫�鏌ユ槸鍚﹀凡瀛樺湪锛堝弻閲嶄繚闄╋級
+ var isExist = false;
+ for (var k = 0; k < existingData.length; k++) {
+ if (existingData[k].HSourceInterID == sourceInfo.hmainid &&
+ existingData[k].HSourceEntryID == sourceInfo.hsubid) {
+ isExist = true;
+ break;
+ }
+ }
+
+ if (isExist) {
+ this.$modal.msgError(`婧愬崟${sourceInfo.鍗曟嵁鍙穧宸插瓨鍦紝璺宠繃`);
+ continue;
+ }
+
+ // 璁＄畻鐩稿叧鏁伴噺
+ var qty = materialInfo.HSNP || 0;
+ var snp = materialInfo.HSNP || 1;
+ var mouldQty = snp > 0 ? Math.ceil(qty / snp) : 0;
+
+ var length = parseFloat(materialInfo.闀垮害) || 0;
+ var width = parseFloat(materialInfo.瀹藉害) || 0;
+ var height = parseFloat(materialInfo.楂樺害) || 0;
+ var rowVolume = (length * width * height * mouldQty).toFixed(2);
+
+ newRows.push({
+ "HSourceInterID": sourceInfo.hmainid,
+ "HSourceEntryID": sourceInfo.hsubid,
+ "HSourceBillNo": sourceInfo.鍗曟嵁鍙�,
+ "HMaterID": materialInfo.HMaterID,
+ "HMaterNumber": materialInfo.鐗╂枡浠ｇ爜,
+ "HMaterName": materialInfo.鐗╂枡鍚嶇О,
+ "HUnitID": materialInfo.HUnitID,
+ "HMouldID": materialInfo.HMouldID,
+ "HMouldNumber": materialInfo.HMouldNumber,
+ "HMouldName": materialInfo.HMouldName,
+ "HMouldLength": materialInfo.闀垮害,
+ "HMouldWidth": materialInfo.瀹藉害,
+ "HMouldHeight": materialInfo.楂樺害,
+ "HMouldFoldHeight": materialInfo.鎶樺彔楂樺害,
+ "HQty": orginHQTY,
+ "HQty_origin": orginHQTY,
+ "HMouldQty": mouldQty,
+ "HVolume": rowVolume,
+ "HSNP": materialInfo.HSNP,
+ HScatteredVolume: 0,
+ });
+ }
+ }
+ }
+
+ if (newRows.length === 0) {
+ this.$modal.msgError("娌℃湁鍙坊鍔犵殑鏂拌褰曪紝鍙兘鏄簮鍗曟暟鎹凡瀛樺湪鎴栫墿鏂欎俊鎭笉瀹屾暣!");
+ this.sourceDataLoading = false;
+ return;
+ }
+
+ // 鍚堝苟鐜版湁鏁版嵁鍜屾柊鏁版嵁
+ var allData = existingData.concat(newRows);
+
+ // 娓叉煋琛ㄦ牸
+ this.editData = allData;
+
+ this.$modal.msgSuccess(`鎴愬姛娣诲姞${newRows.length}鏉¤褰昤);
+ } else {
+ this.$modal.msgError(result.msg || "鑾峰彇鍖呰瀹瑰櫒淇℃伅澶辫触");
+ }
+ } catch (error) {
+ console.error("澶勭悊婧愬崟鏁版嵁鏃跺彂鐢熼敊璇�:", error);
+ this.$modal.msgError("澶勭悊婧愬崟鏁版嵁鏃跺彂鐢熼敊璇紝璇风◢鍚庨噸璇�!");
+ } finally {
+ // 鏃犺鎴愬姛杩樻槸澶辫触锛岄兘鍏抽棴婧愬崟鏁版嵁鍔犺浇鐘舵��
+ this.sourceDataLoading = false;
+ }
+ },
+ //#endregion
+ //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曞彂璐ч�氱煡鍗曟暟鎹�
+ //鏀逛负寮傛鏂规硶锛岃繑鍥濸romise
+ async getPushSeOutStockBillInit(HSourceInterID, HSourceEntryID) {
+ try {
+ const response = await axios.get(this.baseURL + '/Kf_SellOutBill/loadXs_SeOutStockBill_Push', {
+ params: {
+ "HInterID": HSourceInterID,
+ "HSubID": HSourceEntryID
+ },
+ });
+
+ if (response.data.code == 1) {
+ return response.data.data[0];
+ } else {
+ this.$modal.msgError(response.data.msg || "鑾峰彇婧愬崟鏁版嵁澶辫触");
+ return null;
+ }
+ } catch (error) {
+ console.error("鑾峰彇婧愬崟鏁版嵁鏃跺彂鐢熼敊璇�:", error);
+ this.$modal.msgError("鑾峰彇婧愬崟鏁版嵁鏃跺彂鐢熼敊璇紝璇风◢鍚庨噸璇�!");
+ return null;
+ }
+ },
//#region 宸ュ叿鏍忔寜閽搷浣�
//#region 缂栬緫鎻愪氦淇濆瓨
submitForm() {
@@ -1127,78 +1545,6 @@
//#region 璁剧疆瀛愯〃搴忓彿鍒�
rowSysZbIndex({ row, rowIndex }) {
row.index = rowIndex + 1;
- },
- //#endregion
-
- //#region 瀛愯〃鏂板銆佹彃鍏ユ寜閽搷浣�
- handleAddSysZb(index, num) {
- if (num == 1 && !index) {
- this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
- } else {
- let obj = {
- HMaterID: 0,
- 鐗╂枡浠ｇ爜: '',
- 鐗╂枡鍚嶇О: '',
- 瑙勬牸鍨嬪彿: '',
- HUnitID: 0,
- 璁￠噺鍗曚綅: '',
- HQtyMust: 1,
- HQty: 1,
- HPieceQty: 0,
- HPrice: 0,
- HTaxPrice: 0,
- HTaxRate: 0,
- HMoney: 0,
- HTaxMoney: 0,
- HWHID: 0,
- 鍙戣揣浠撳簱: '',
- HRemark: '',
- HQty_Full: 0,
- HQty_Empty: 0,
- HQty_Back: 0,
- HCostPrice: 0,
- HCostMoney: 0,
- HSalePrice: 0,
- HSeOrderInterID: 741,
- HSeOrderEntryID: 18,
- HSeOrderBillNo: '',
- HSourceInterID: 741,
- HSourceEntryID: 18,
- HSourceBillNo: '',
- HSourceBillType: 1402,
- HRelationQty: 0,
- HRelationMoney: 0,
- HSPID: 0,
- HSPName: '',
- HSPGroupID: 0,
- HSPGroupName: '',
- HSCWHID: 0,
- HSCWHName: '',
- HSCSPID: 0,
- HSCSPName: '',
- HBatchNo: '',
- HPOOrderInterID: 0,
- HPOOrderEntryID: 0,
- HPOOrderBillNo: '',
- HPropertyID: 0,
- HPropertyName: '',
- HSecUnitID: 0,
- HSecUnitName: '',
- HSecUnitRate: 0,
- HEngineNum: '',
- HUnderPanNum: '',
- HLeaveFactCard: '',
- HReqBuyQty: 0,
- HReqOutQty: 0,
- HCurrentInventory: 0,
- }
- if (index) {
- this.editData.splice(index, 0, obj);
- this.$set(this.editData, index, obj)
- } else {
- this.editData.push(obj);
- }
- }
},
//#endregion
@@ -1302,11 +1648,10 @@
getHBillNo() {
axios.get(this.$baseUrl + "/WEBSController/GetMaxBillNoAndID_Json", {
params: {
- HBillType: '1201'
+ HBillType: '3321'
}
}).then(response => {
this.form.HBillNo = response.data.data[0].HBillNo
- this.form.HInterID = response.data.data[0].HInterID
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
@@ -1424,11 +1769,128 @@
var maxVolume = parseFloat((this.form.HCarTypeMaxVolume).val()) || 0;
if (maxVolume > 0) {
var loadingRate = (totalVolume / maxVolume * 100).toFixed(2);
- this.form.HLoadingRate=loadingRate + "%"
+ this.form.HLoadingRate = loadingRate + "%"
} else {
- this.form.HLoadingRate==''
+ this.form.HLoadingRate == ''
}
- }
+ },
+ //#endregion
+
+ //#region 闄勪欢涓婁紶鐩稿叧鏂规硶
+ // 鏂囦欢閫夋嫨鍙樺寲鏃剁殑澶勭悊
+ handleFileChange(file, fileList) {
+ this.uploadFiles = fileList;
+ this.fileList = this.uploadFiles.map(item => {
+ // 鑾峰彇鏂囦欢鎵╁睍鍚�
+ const fileName = item.name;
+ const fileExt = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
+ return {
+ ...item,
+ HFileName: item.name,
+ HFileSize: item.size,
+ HFileType: fileExt,
+ HFileStatus: '鏈笂浼�'
+ };
+ });
+ },
+
+ // 鏂囦欢绉婚櫎鏃剁殑澶勭悊
+ handleFileRemove(file, fileList) {
+ this.uploadFiles = fileList;
+ },
+ flieUpload(row) {
+ // 鍒涘缓FormData瀵硅薄
+ const formData = new FormData();
+
+ // 娣诲姞鏂囦欢鍒癋ormData
+ formData.append('files', row);
+
+ // 娣诲姞鍏朵粬鍙傛暟
+ formData.append('HBillNo', this.form.HBillNo);
+ formData.append('HRemark', '');
+ formData.append('HUserName', sessionStorage["HUserName"]);
+ // 璁剧疆涓婁紶URL
+ this.uploadUrl = this.baseURL + '/Gy_QCVerificationBillMain/UploadFile_Gy_QCVerification';
+ // 鍙戦�佷笂浼犺姹�
+ axios.post(this.uploadUrl, formData, {
+ headers: {
+ 'Content-Type': 'multipart/form-data'
+ }
+ }).then(response => {
+ if (response.data.code === 1) {
+ this.$message.success('鏂囦欢涓婁紶鎴愬姛');
+
+ // 閲嶆柊鑾峰彇宸蹭笂浼犳枃浠跺垪琛�
+ this.getFileList();
+ } else {
+ this.$message.error(response.data.Message || '涓婁紶澶辫触');
+ }
+ }).catch(error => {
+ this.uploadLoading = false;
+ this.$message.error('涓婁紶璇锋眰澶辫触');
+ console.error('涓婁紶閿欒:', error);
+ });
+ },
+ // 鎻愪氦涓婁紶鏂囦欢
+ submitUpload() {
+ if (this.uploadFiles.length === 0) {
+ this.$message.warning('璇峰厛閫夋嫨瑕佷笂浼犵殑鏂囦欢');
+ return;
+ }
+
+ if (!this.form.HBillNo) {
+ this.$message.warning('璇峰厛淇濆瓨琛ㄥ崟鑾峰彇鍗曟嵁鍙�');
+ return;
+ }
+
+ this.uploadLoading = true;
+
+ // 鍒涘缓FormData瀵硅薄
+ const formData = new FormData();
+
+ // 娣诲姞鏂囦欢鍒癋ormData
+ this.uploadFiles.forEach(file => {
+ formData.append('files', file.raw);
+ });
+
+ // 娣诲姞鍏朵粬鍙傛暟
+ formData.append('HBillNo', this.form.HBillNo);
+ formData.append('HUserName', sessionStorage.getItem('HUserName') || '');
+
+ // 璁剧疆涓婁紶URL
+ this.uploadUrl = this.baseURL + '/Gy_QCVerificationBillMain/UploadFile_Gy_QCVerification';
+
+ // 鍙戦�佷笂浼犺姹�
+ axios.post(this.uploadUrl, formData, {
+ headers: {
+ 'Content-Type': 'multipart/form-data'
+ }
+ }).then(response => {
+ this.uploadLoading = false;
+ if (response.data.code === 1) {
+ this.$message.success('鏂囦欢涓婁紶鎴愬姛');
+ // 娓呯┖寰呬笂浼犳枃浠跺垪琛�
+ this.uploadFiles = [];
+ // 閲嶆柊鑾峰彇宸蹭笂浼犳枃浠跺垪琛�
+ this.getFileList();
+ } else {
+ this.$message.error(response.data.Message || '涓婁紶澶辫触');
+ }
+ }).catch(error => {
+ this.uploadLoading = false;
+ this.$message.error('涓婁紶璇锋眰澶辫触');
+ console.error('涓婁紶閿欒:', error);
+ });
+ },
+
+ // 鑾峰彇宸蹭笂浼犳枃浠跺垪琛�
+ getFileList() {
+ },
+
+ // 鍒犻櫎鏂囦欢
+ deleteFile(index) {
+ this.uploadFiles.splice(index, 1)
+ },
//#endregion
//#endregion
}
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index 4657d43..31ccd13 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -132,7 +132,7 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="handleEdit(row = rowForm, OperationType = 3)">缂栬緫</el-button>
+ @click="handleEdit(row = rowForm, OperationType = 3, copyType = 0)">缂栬緫</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
@@ -141,6 +141,34 @@
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
+ @click="set_ConfirmBill">渚涘簲鍟嗙‘璁�</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
+ @click="set_ConfirmOtherBill(1)">鍒板巶纭</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
+ @click="set_ConfirmOtherBill(2)">鎻愯揣纭</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
+ @click="set_ConfirmOtherBill(3)">鍑哄巶杩愯緭纭</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
+ @click="set_ConfirmOtherBill(4)">鍒拌揣绛炬敹纭</el-button>
+ </el-col>
+ <!-- <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
+ @click="set_CheckBill(0, form = rowForm)">鍒嗛厤鍙告満</el-button>
+ </el-col> -->
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
+ @click="handleVolume(rowForm)">缁存姢闆跺崟鍗犵敤浣撶Н</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
@@ -172,9 +200,9 @@
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-date" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
</el-col>
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-printer" size="mini" @click="get_PrintReport">鎵撳嵃</el-button>
- </el-col>
+ </el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single"
@click="get_BarCodeDetail">鏉＄爜鏄庣粏</el-button>
@@ -182,7 +210,7 @@
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single"
@click="get_PackStockDetail">鍖呰瀹瑰櫒鍑哄叆搴撴槑缁�</el-button>
- </el-col>
+ </el-col>-->
</el-row>
<div class="tableBox" v-loading="loading">
<el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
@@ -228,6 +256,21 @@
<PrintList :linterid=this.rowForm.HInterID :MyMsg=this.rowForm.HInterID :Type='HBillType'
:HModName="HModName" @rowEditClose="rowSetClose" v-if="printListShow" />
<!-- <div>111</div> -->
+ </el-dialog>
+
+ <el-dialog title="缁存姢闆跺崟鍗犵敤浣撶Н" :visible.sync="openVolume" width="580px" append-to-body>
+ <el-form ref="form" :model="formVolume" :rules="rulesVolume" label-width="130px">
+ <el-form-item label="鍗曟嵁鍙�">
+ <el-input v-model="formVolume.鍗曟嵁鍙�" placeholder="璇疯緭鍏ュ崟鎹彿" disabled />
+ </el-form-item>
+ <el-form-item label="闆跺崟鍗犵敤浣撶Н">
+ <el-input-number v-model="formVolume.currentVolume" placeholder="璇疯緭鍏ラ浂鍗曞崰鐢ㄤ綋绉�" />
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="set_HScatteredVolumeList">纭� 瀹�</el-button>
+ <el-button @click="cancelVolume">鍙� 娑�</el-button>
+ </div>
</el-dialog>
<!-- 鏉＄爜鏄庣粏 -->
<BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail" />
@@ -304,7 +347,7 @@
rowHideShow: false, //鍒楄缃粍浠跺鍣ㄦ樉绀烘爣璁�
barCodeDetailShow: false, //鏉＄爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
packStockDetailShow: false, //鍖呰瀹瑰櫒鍑哄叆搴撴槑缁嗗鍣ㄦ樉绀烘爣璁�
-
+ openVolume: false, //缁存姢闆跺崟鍗犵敤浣撶Н寮圭獥鏍囪
// 鏌ヨ鍙傛暟
@@ -342,7 +385,8 @@
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
selectedRow: null, // 褰撳墠閫変腑鐨勮
rowForm: {}, // 褰撻�変腑鐨勫彧鏈変竴琛屾椂锛屾洿鏂版暟鎹负璇ラ�変腑鐨勮銆�
-
+ formVolume: {}, // 缁存姢闆跺崟鍗犵敤浣撶Н琛ㄥ崟銆�
+ rulesVolume: {}, // 缁存姢闆跺崟鍗犵敤浣撶Н琛ㄥ崟楠岃瘉銆�
tyResList: [], // 鍒楄〃鏁版嵁锛岀敤浜庡鍑�
titleData: ["HInterID", "HEntryID", "HBillStatus", "HMaterID", "HPreventErrMouldID", "HOrgID"], // 涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
btResList: [], // 鍒楄〃琛ㄥご鏁版嵁銆傜敤浜庡垪璁剧疆
@@ -512,7 +556,6 @@
if (this.queryParams.sTime) {
this.queryParams.sTime = moment(this.queryParams.sTime).format('YYYY-MM-DD')
this.queryParams.eTime = moment(this.queryParams.eTime).format('YYYY-MM-DD')
- console.log(this.queryParams.sTime, this.queryParams.eTime)
this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.queryParams.sTime + "'" + " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.queryParams.eTime + "'";
}
if (this.queryParams.HBillNo) {
@@ -648,12 +691,129 @@
this.$modal.msgError("閿欒:" + result.code + result.Message);
}
}).catch(error => {
+ console.log(error)
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
}).catch(() => { })
},
//#endregion
+ //#region 鎵胯繍鍟嗙‘璁�
+ set_ConfirmBill() {
+ var confirmMes = "";
+ if (this.rowForm["鎵胯繍鍟嗙‘璁ゆ椂闂�"] != null) {
+ confirmMes = "鏄惁鏇存柊鎵胯繍鍟嗙‘璁ゆ椂闂�?"
+ } else {
+ confirmMes = "鏄惁纭鎵胯繍鍟嗙‘璁ゆ椂闂�?"
+
+ }
+ this.$modal.confirm(confirmMes).then(() => {
+ axios.get(this.baseURL + "/WLYayBillController/ConfrimBillNo", {
+ params: { 'HInterID': this.rowForm.HInterID.toString(), "IsAudit": 0, 'CurUserName': sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.count == 1) {
+ this.handleQuery()
+ this.$modal.msgSuccess(result.Message)
+ } else {
+ this.$modal.msgError(result.code + result.Message);
+ }
+ }).catch(error => {
+ console.log(error)
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }).catch(() => { })
+
+ },
+ //#endregion
+ //#region 鍏朵粬纭
+ set_ConfirmOtherBill(nums) {
+ var confirmMes = "";
+ if (nums === 1) {
+ confirmMes = "鏄惁纭鍒板巶?"
+ }
+ else if (nums === 2) {
+ confirmMes = "鏄惁纭鎻愯揣?"
+ }
+ else if (nums === 3) {
+ confirmMes = "鏄惁纭鍑哄巶杩愯緭?"
+ }
+ else if (nums === 4) {
+ confirmMes = "鏄惁纭鍒拌揣绛炬敹?"
+ } else {
+ confirmMes = "鏄惁纭鎵胯繍鍟嗙‘璁ゆ椂闂�?"
+ }
+ this.$modal.confirm(confirmMes).then(() => {
+ axios.get(this.baseURL + "/WLYayBillController/ConfrimOtherBillNo", {
+ params: { 'HInterID': this.rowForm.HInterID.toString(), "IsAudit": nums, 'CurUserName': sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.count == 1) {
+ this.handleQuery()
+ this.$modal.msgSuccess(result.Message)
+ } else {
+ this.$modal.msgError(result.code + result.Message);
+ }
+ }).catch(error => {
+ console.log(error)
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }).catch(() => { })
+ },
+ //#endregion
+ //#region 缁存姢闆跺崟鍗犵敤浣撶Н
+ //#region 缁存姢闆跺崟鍗犵敤浣撶Н閲嶇疆
+ resetVolume() {
+ this.formVolume = {
+ HInterID: 0,
+ HEntryID0: 0,
+ currentVolume: 0,
+ 鍗曟嵁鍙�: ''
+ }
+ },
+ //#endregion
+ //#region 缁存姢闆跺崟鍗犵敤浣撶Н閲嶇疆
+ handleVolume(form) {
+ this.resetVolume()
+ axios.get(this.baseURL + "/WLYayBillController/WL_YayBillDetail", {
+ params: { 'HID': form.HInterID }
+ }).then(response => {
+ console.log(response.data.data.h_v_WL_YayBillEdit)
+ // this.formVolume = response.data.data.h_v_WL_YayBillEdit[form.HEntryID-1]
+ this.formVolume=form
+ this.openVolume = true
+ })
+ },
+ //#endregion
+ cancelVolume() {
+ this.openVolume = false
+ this.resetVolume()
+ },
+ //#region 缁存姢闆跺崟鍗犵敤浣撶Н鎻愪氦
+ set_HScatteredVolumeList() {
+ axios.get(this.baseURL + "/WLYayBillController/updateBillMEs", {
+ params: {
+ 'HInterID': this.formVolume.HInterID.toString(),
+ "HEntryID": this.formVolume.HEntryID.toString(),
+ "ScatteredVolume": this.formVolume.currentVolume,
+ 'CurUserName': sessionStorage["HUserName"]
+ }
+ }).then(response => {
+ let result = response.data
+ if (result.count == 1) {
+ this.handleQuery()
+ this.openVolume = true
+ this.$modal.msgSuccess(result.Message)
+ } else {
+ this.$modal.msgError(result.code + result.Message);
+ }
+ }).catch(error => {
+ console.log(error)
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+ //#endregion
//#region 瀹℃牳/鍙嶅鏍�
set_CheckBill(num, form) {
var InterID = form.hmainid || form.HInterID
@@ -876,7 +1036,7 @@
get_PrintReport() {
if (this.ids.length != 1) {
this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
- } else if (this.rowForm.鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
+ } else if (this.rowForm.鍗曟嵁鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
} else {
axios.get(this.$baseUrl + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
diff --git a/src/views/sell/XsSeOutStockBill.vue b/src/views/sell/XsSeOutStockBill.vue
index 87eaa6d..36b4215 100644
--- a/src/views/sell/XsSeOutStockBill.vue
+++ b/src/views/sell/XsSeOutStockBill.vue
@@ -1,86 +1,38 @@
<template>
- <div style="padding: 10px">
- <el-form
- :model="queryParams"
- ref="queryForm"
- size="small"
- :inline="true"
- label-width="78px"
- class="searchBox"
- >
+ <div style="padding: 10px; position: relative;">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
<el-row>
<el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
- <el-date-picker
- v-model="sTime"
- type="date"
- placeholder="寮�濮嬫棩鏈�"
- style="width: 150px"
- :disabled="queryParams.HInitTimeCycle != -1"
- value-format="yyyy-MM-dd"
- >
+ <el-date-picker v-model="sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="缁撴潫鏃ユ湡">
- <el-date-picker
- v-model="eTime"
- type="date"
- placeholder="缁撴潫鏃ユ湡"
- style="width: 150px"
- :disabled="queryParams.HInitTimeCycle != -1"
- value-format="yyyy-MM-dd"
- >
+ <el-date-picker v-model="eTime" type="date" placeholder="缁撴潫鏃ユ湡" style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="鏃ユ湡闂撮殧">
- <el-select
- v-model="queryParams.HInitTimeCycle"
- placeholder="璇烽�夋嫨"
- @change="riqiChange"
- >
- <el-option
- v-for="(item, index) in rqsgList"
- :key="index"
- :label="item.label"
- :value="item.value"
- >
+ <el-select v-model="queryParams.HInitTimeCycle" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-option v-for="(item, index) in rqsgList" :key="index" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
- <el-input
- v-model="queryParams.HBillNo"
- placeholder="璇疯緭鍏ュ崟鎹彿"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="椤圭洰缂栧彿" prop="HProjectNumber">
- <el-input
- v-model="queryParams.HProjectNumber"
- placeholder="璇疯緭鍏ラ」鐩紪鍙�"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.HProjectNumber" placeholder="璇疯緭鍏ラ」鐩紪鍙�" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="缁勭粐">
- <el-select
- v-model="queryParams.HOrgID"
- placeholder="璇烽�夋嫨"
- class="ForFilteringSchemes"
- >
- <el-option
- v-for="(item, index) in organizationList"
- :key="index"
- :label="item.Name"
- :value="item.ID.toString()"
- >
+ <el-select v-model="queryParams.HOrgID" placeholder="璇烽�夋嫨" class="ForFilteringSchemes">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name"
+ :value="item.ID.toString()">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鍗曟嵁鍙�" prop="HBillNo2">
- <el-input
- v-model="form.HBillNo2"
- placeholder="璇疯緭鍏ュ悓姝ュ崟鎹彿"
- @keyup.enter.native="BillSync"
- >
+ <el-input v-model="form.HBillNo2" placeholder="璇疯緭鍏ュ悓姝ュ崟鎹彿" @keyup.enter.native="BillSync">
<el-button slot="append" @click="BillSync">閲嶆柊鍚屾</el-button>
</el-input>
</el-form-item>
@@ -89,25 +41,13 @@
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
<el-form-item label="瀹㈡埛" prop="HCusID">
- <el-input
- v-model="queryParams.HCusID"
- placeholder="璇疯緭鍏ュ鎴�"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.HCusID" placeholder="璇疯緭鍏ュ鎴�" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="閮ㄩ棬" prop="HDeptID">
- <el-input
- v-model="queryParams.HDeptID"
- placeholder="璇疯緭鍏ラ儴闂�"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.HDeptID" placeholder="璇疯緭鍏ラ儴闂�" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="涓荤" prop="HMangerID">
- <el-input
- v-model="queryParams.HMangerID"
- placeholder="璇疯緭鍏ヤ富绠�"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.HMangerID" placeholder="璇疯緭鍏ヤ富绠�" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-card class="box-card">
<div slot="header" class="clearfix"><span>杩囨护</span></div>
@@ -115,132 +55,69 @@
<el-row>
<el-form-item label-width="0">
<el-col :span="7">
- <el-select
- v-model="queryParams.ColName1"
- placeholder="璇烽�夋嫨"
- @change="riqiChange"
- class="ForFilteringSchemes"
- >
+ <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange"
+ class="ForFilteringSchemes">
<span v-for="(item, index) in btList" :key="index">
- <el-option
- :label="item.field"
- :value="item.field"
- v-if="!item.hide"
- ></el-option>
+ <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
</span>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select
- v-model="queryParams.Comparator1"
- placeholder="璇烽�夋嫨"
- @change="riqiChange"
- class="ForFilteringSchemes"
- >
- <el-option
- v-for="(item, index) in comparatorList"
- :key="index"
- :label="item.label"
- :value="item.value"
- ></el-option>
+ <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" @change="riqiChange"
+ class="ForFilteringSchemes">
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
</el-select>
</el-col>
<el-col :span="11">
- <el-input
- v-model="queryParams.ColContent1"
- placeholder="璇疯緭鍏�"
- clearable
- @keyup.enter.native="handleQuery"
- class="ForFilteringSchemes"
- />
+ <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
</el-col>
</el-form-item>
</el-row>
<el-row>
<el-form-item label-width="0">
<el-col :span="7">
- <el-select
- v-model="queryParams.ColName2"
- placeholder="璇烽�夋嫨"
- @change="riqiChange"
- class="ForFilteringSchemes"
- >
+ <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange"
+ class="ForFilteringSchemes">
<span v-for="(item, index) in btList" :key="index">
- <el-option
- :label="item.field"
- :value="item.field"
- v-if="!item.hide"
- ></el-option>
+ <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
</span>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select
- v-model="queryParams.Comparator2"
- placeholder="璇烽�夋嫨"
- @change="riqiChange"
- class="ForFilteringSchemes"
- >
+ <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange"
+ class="ForFilteringSchemes">
<span v-for="(item, index) in btList" :key="index">
- <el-option
- :label="item.field"
- :value="item.field"
- v-if="!item.hide"
- ></el-option>
+ <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
</span>
</el-select>
</el-col>
<el-col :span="11">
- <el-input
- v-model="queryParams.ColContent2"
- placeholder="璇疯緭鍏�"
- clearable
- @keyup.enter.native="handleQuery"
- class="ForFilteringSchemes"
- />
+ <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
</el-col>
</el-form-item>
</el-row>
<el-row>
<el-form-item label-width="0">
<el-col :span="7">
- <el-select
- v-model="queryParams.ColName"
- placeholder="璇烽�夋嫨"
- @change="riqiChange"
- class="ForFilteringSchemes"
- >
- <el-option
- v-for="(item, index) in btList"
- :key="index"
- :label="item.field"
- :value="item.field"
- ></el-option>
+ <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange"
+ class="ForFilteringSchemes">
+ <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
+ :value="item.field"></el-option>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select
- v-model="queryParams.Comparator"
- placeholder="璇烽�夋嫨"
- @change="riqiChange"
- class="ForFilteringSchemes"
- >
- <el-option
- v-for="(item, index) in comparatorList"
- :key="index"
- :label="item.label"
- :value="item.value"
- ></el-option>
+ <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" @change="riqiChange"
+ class="ForFilteringSchemes">
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
</el-select>
</el-col>
<el-col :span="11">
- <el-input
- v-model="queryParams.ColContent"
- placeholder="璇疯緭鍏�"
- clearable
- @keyup.enter.native="handleQuery"
- class="ForFilteringSchemes"
- />
+ <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
</el-col>
</el-form-item>
</el-row>
@@ -251,11 +128,8 @@
<el-form-item label-width="78px">
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">
- 鎼� 绱�</el-button
- >
- <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false"
- >鍙� 娑�</el-button
- >
+ 鎼� 绱�</el-button>
+ <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false">鍙� 娑�</el-button>
</el-form-item>
</el-form>
@@ -271,24 +145,12 @@
>
</el-col> -->
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-plus"
- size="mini"
- @click="handleAddEdit((OperationType = 1))"
- id="btn-Add"
- >鏂板</el-button
- >
+ <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit((OperationType = 1))"
+ id="btn-Add">鏂板</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 3), (copyType = -1))"
- >缂栬緫</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="handleEdit((row = rowForm), (OperationType = 3), (copyType = -1))">缂栬緫</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
@@ -302,13 +164,7 @@
</el-col>
-->
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-delete"
- size="mini"
- :disabled="single"
- @click="handleDelete"
- >鍒犻櫎
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
</el-button>
</el-col>
<!--
@@ -416,22 +272,10 @@
</el-col> -->
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- >瀵煎嚭</el-button
- >
+ <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-download"
- size="mini"
- @click="handleRowHide"
- >闅愯棌鍒楄缃�</el-button
- >
+ <el-button type="primary" icon="el-icon-download" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
@@ -446,87 +290,37 @@
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
</el-row>
<div class="tableBox" v-loading="loading">
- <el-table
- :data="tableData"
- ref="tableData"
- max-height="750"
- :summary-method="getSummaries"
- @selection-change="handleSelectionChange"
- show-summary
- border
- @row-click="handleRowClick"
- :row-style="rowStyle"
- @cell-dblclick="handleDblclick"
- v-if="tableShow"
- >
+ <el-table :data="tableData" ref="tableData" max-height="750" :summary-method="getSummaries"
+ @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
+ @cell-dblclick="handleDblclick" v-if="tableShow">
<template v-for="(item, index) in btList">
- <el-table-column
- type="selection"
- width="55"
- align="center"
- :fixed="item.fixed"
- v-if="item.type == 'checkbox'"
- :key="index"
- />
- <el-table-column
- :align="item.align"
- :prop="item.field"
- :label="item.title"
- :width="item.width"
- :key="item.sorderid"
- v-else-if="!item.hide && item.type != 'checkbox'"
- :sortable="item.sort"
- show-overflow-tooltip
- :fixed="item.fixed"
- >
+ <el-table-column type="selection" width="55" align="center" :fixed="item.fixed" v-if="item.type == 'checkbox'"
+ :key="index" />
+ <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width"
+ :key="item.sorderid" v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort"
+ show-overflow-tooltip :fixed="item.fixed">
<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>
- <el-button
- type="text"
- @click.stop="handleEdit(row, (OperationType = 3), (copyType = 1))"
- v-else-if="column.property == '鍗曟嵁鍙�'"
- >{{ row.鍗曟嵁鍙� }}</el-button
- >
+ <el-button type="text" @click.stop="handleEdit(row, (OperationType = 3), (copyType = 1))"
+ v-else-if="column.property == '鍗曟嵁鍙�'">{{ row.鍗曟嵁鍙� }}</el-button>
<span v-else>{{ row[column.label] }}</span>
</div>
</template>
</el-table-column>
</template>
</el-table>
- <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"
- />
+ <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" />
</el-dialog>
<!-- 缂栬緫 -->
- <el-dialog
- title="缂栬緫鍙戣揣閫氱煡鍗�"
- :visible.sync="openEdit"
- width="1480px"
- append-to-body
- class="xsckdBox"
- :before-close="close"
- >
+ <el-dialog title="缂栬緫鍙戣揣閫氱煡鍗�" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
+ :before-close="close">
<!-- <edit
:OperationType="OperationType"
:linterid="this.rowForm.HItemID"
@@ -540,92 +334,39 @@
<iframe :src="iframeUrl" frameborder="0" width="100%" height="100%"></iframe>
</div>
</el-dialog>
- <el-dialog
- :title="upload.title"
- :visible.sync="upload.open"
- width="1500px"
- append-to-body
- >
+ <el-dialog :title="upload.title" :visible.sync="upload.open" width="1500px" append-to-body>
<div style="margin-top: -20px">
<el-button type="primary" @click="set_AddNew">瀵煎叆鏁版嵁</el-button>
<el-button type="primary" @click="upload.open = false">閫� 鍑�</el-button>
- <el-upload
- ref="upload"
- :limit="1"
- accept=".xlsx, .xls"
- style="display: inline-block; margin-left: 10px"
- :action="upload.url + '?updateSupport=' + upload.updateSupport"
- :disabled="upload.isUploading"
- :on-progress="handleFileUploadProgress"
- :on-success="handleFileSuccess"
- >
+ <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" style="display: inline-block; margin-left: 10px"
+ :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+ :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess">
<el-button type="primary">鏂囦欢涓婁紶</el-button>
</el-upload>
</div>
- <el-table
- :data="uploadData"
- v-loading="uploadTableLoading"
- :row-class-name="uploadDataIndex"
- border
- height="550"
- >
+ <el-table :data="uploadData" v-loading="uploadTableLoading" :row-class-name="uploadDataIndex" border
+ height="550">
<el-table-column type="index" label="搴忓彿" width="55" align="center" />
<el-table-column label="缁勭粐浠ｇ爜" prop="缁勭粐浠ｇ爜" align="center" width="120" />
<el-table-column label="缁勭粐鍚嶇О" prop="缁勭粐鍚嶇О" align="center" width="120" />
- <el-table-column
- label="鐢熶骇璧勬簮鍚嶇О"
- prop="鐢熶骇璧勬簮鍚嶇О"
- align="center"
- width="120"
- />
- <el-table-column
- label="鐢熶骇璧勬簮浠ｇ爜"
- prop="鐢熶骇璧勬簮浠ｇ爜"
- align="center"
- width="120"
- />
+ <el-table-column label="鐢熶骇璧勬簮鍚嶇О" prop="鐢熶骇璧勬簮鍚嶇О" align="center" width="120" />
+ <el-table-column label="鐢熶骇璧勬簮浠ｇ爜" prop="鐢熶骇璧勬簮浠ｇ爜" align="center" width="120" />
<el-table-column label="閮ㄩ棬浠ｇ爜" prop="閮ㄩ棬浠ｇ爜" align="center" width="120" />
<el-table-column label="閮ㄩ棬鍚嶇О" prop="閮ㄩ棬鍚嶇О" align="center" width="120" />
- <el-table-column
- label="璐熻矗浜轰唬鐮�"
- prop="璐熻矗浜轰唬鐮�"
- align="center"
- width="120"
- />
+ <el-table-column label="璐熻矗浜轰唬鐮�" prop="璐熻矗浜轰唬鐮�" align="center" width="120" />
<el-table-column label="璐熻矗浜�" prop="璐熻矗浜�" align="center" width="120" />
- <el-table-column
- label="宸ヤ綔涓績浠ｇ爜"
- prop="宸ヤ綔涓績浠ｇ爜"
- align="center"
- width="120"
- />
- <el-table-column
- label="宸ヤ綔涓績鍚嶇О"
- prop="宸ヤ綔涓績鍚嶇О"
- align="center"
- width="120"
- />
+ <el-table-column label="宸ヤ綔涓績浠ｇ爜" prop="宸ヤ綔涓績浠ｇ爜" align="center" width="120" />
+ <el-table-column label="宸ヤ綔涓績鍚嶇О" prop="宸ヤ綔涓績鍚嶇О" align="center" width="120" />
<el-table-column label="鍗曠彮宸ユ椂" prop="鍗曠彮宸ユ椂" align="center" width="120" />
<el-table-column label="鎿嶄綔" align="center">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="uploadDataDelete(scope.row)"
- >鍒犻櫎</el-button
- >
+ <el-button size="mini" type="text" icon="el-icon-delete"
+ @click="uploadDataDelete(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="uploadTotal > 0"
- :total="uploadTotal"
- :page.sync="uploadPage"
- :limit.sync="uploadPageSize"
- :pageSizes="uploadPageSizes"
- @pagination="currentPage"
- />
+ <pagination v-show="uploadTotal > 0" :total="uploadTotal" :page.sync="uploadPage" :limit.sync="uploadPageSize"
+ :pageSizes="uploadPageSizes" @pagination="currentPage" />
</el-dialog>
</div>
</div>
@@ -641,6 +382,8 @@
components: { RowSettings },
props: {
openPage: { type: String },
+ openType: { type: String },
+ propsHOrgID: {},
},
data() {
return {
@@ -711,6 +454,7 @@
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
selectedRow: null, // 褰撳墠閫変腑鐨勮
rowForm: {},
+ selRowList: [],//閫夋嫨琛屾暟鎹�
checkedSysZb: [],
editData: [], //鐢熶骇璧勬枡瀛愯〃
editBtData: [], //瀛愯〃琛ㄥご
@@ -952,7 +696,9 @@
if (this.pageSize == 0) {
this.pageSize = 50;
}
-
+ if (this.openPage && this.propsHOrgID) {
+ this.queryParams.HOrgID = this.propsHOrgID
+ }
// this.queryParams.HOrgID = 100038
// this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
// 鏀舵枡閫氱煡鍗曞垪琛�
@@ -1219,6 +965,9 @@
this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
+ if (this.openPage) {
+ this.$emit('deptEmit', this.selRowList, 12)
+ }
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
@@ -1240,6 +989,7 @@
if (!this.single) {
this.rowForm = selection[0];
}
+ this.selRowList = selection
},
//鎵撳紑渚ц竟鎼滅储寮圭獥
handleSearch() {
@@ -1474,7 +1224,7 @@
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
}
})
- .catch(() => {});
+ .catch(() => { });
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
@@ -1638,8 +1388,8 @@
} else {
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- res.Message +
- "</div>",
+ res.Message +
+ "</div>",
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
@@ -1668,8 +1418,8 @@
.then((res) => {
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- res.data.Message +
- "</div>",
+ res.data.Message +
+ "</div>",
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
@@ -1693,7 +1443,7 @@
return deleteList.indexOf(item.index) == -1;
});
})
- .catch(() => {});
+ .catch(() => { });
},
getPage(page, list) {
let sindex = (parseInt(page) - 1) * this.uploadPageSize;
@@ -1716,7 +1466,7 @@
width: 100%;
}
-.form-item-inline > .el-form-item__content {
+.form-item-inline>.el-form-item__content {
display: flex;
flex-direction: row;
width: 60%;
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
index 03692bf..d592867 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
@@ -223,6 +223,7 @@
,HPOOrderBillMTO:"" //閲囪喘璺熻釜鍙�
,HSeOrderBillNo:"" //瀹㈡埛璁㈠崟鍙�
,HCusModel:"" //浜у搧鍨嬪彿
+ ,HMTONo:null //璁″垝璺熻釜鍙�
,HOrganizationID:0 //缁勭粐ID
,HOrganization:"" //缁勭粐鍚嶇О
@@ -427,6 +428,13 @@
return Result = false;
}
+ var regex = /^\d{4}-\d{2}-\d{2}$/; //姝ｅ垯琛ㄨ揪寮忥細鏍￠獙 yyyy-MM-dd
+ temp = this.initMainData.HInspectionDate;
+ if(!regex.test(temp)){
+ this.$modal.msgError("璇疯缃敓浜ф棩鏈燂紒锛侊紒");
+ return Result = false;
+ }
+
// var HEndQty = this.initMainData.HEndQty;
// if (HEndQty == "") {
// this.$modal.msgError("灏惧寘鏁伴噺涓嶈兘涓虹┖锛侊紒");
@@ -518,6 +526,7 @@
, "HReInspectionDate": this.initMainData.HReInspectionDate
, "HPOOrderBillMTO": this.initMainData.HPOOrderBillMTO
, "HSeOrderBillNo": this.initMainData.HSeOrderBillNo
+ , "HMTONo": this.initMainData.HMTONo
}
]
@@ -654,6 +663,7 @@
this.initMainData.HPOOrderBillMTO = dataArray[0].閲囪喘璺熻釜鍙�;
this.initMainData.HSeOrderBillNo = dataArray[0].瀹㈡埛璁㈠崟鍙�;
this.initMainData.HCusModel = dataArray[0].浜у搧鍨嬪彿;
+ this.initMainData.HMTONo = dataArray[0].璁″垝璺熻釜鍙�;
this.initMainData.HMinQty = 0;
if(this.initMainData.HMinQty>0){
this.initMainData.HBQty = (this.initMainData.HQty_SourceBill / this.initMainData.HMinQty) + (this.initMainData.HQty_SourceBill%this.initMainData.HMinQty == 0?0:1);
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
index 68377fa..25c56a3 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
@@ -222,7 +222,8 @@
,HReInspectionDate:null //澶嶆鏃ユ湡
,HPOOrderBillMTO:"" //閲囪喘璺熻釜鍙�
,HSeOrderBillNo:"" //瀹㈡埛璁㈠崟鍙�
- ,HCusModel:"" //浜у搧鍨嬪彿
+ ,HCusModel:"" //浜у搧鍨嬪彿
+ ,HMTONo:null //璁″垝璺熻釜鍙�
,HOrganizationID:0 //缁勭粐ID
,HOrganization:"" //缁勭粐鍚嶇О
@@ -428,6 +429,13 @@
return Result = false;
}
+ var regex = /^\d{4}-\d{2}-\d{2}$/; //姝ｅ垯琛ㄨ揪寮忥細鏍￠獙 yyyy-MM-dd
+ temp = this.initMainData.HInspectionDate;
+ if(!regex.test(temp)){
+ this.$modal.msgError("璇疯缃敓浜ф棩鏈燂紒锛侊紒");
+ return Result = false;
+ }
+
// var HEndQty = this.initMainData.HEndQty;
// if (HEndQty == "") {
// this.$modal.msgError("灏惧寘鏁伴噺涓嶈兘涓虹┖锛侊紒");
@@ -519,6 +527,7 @@
, "HReInspectionDate": this.initMainData.HReInspectionDate
, "HPOOrderBillMTO": this.initMainData.HPOOrderBillMTO
, "HSeOrderBillNo": this.initMainData.HSeOrderBillNo
+ , "HMTONo": this.initMainData.HMTONo
}
]
@@ -655,6 +664,7 @@
this.initMainData.HPOOrderBillMTO = dataArray[0].閲囪喘璺熻釜鍙�;
this.initMainData.HSeOrderBillNo = dataArray[0].瀹㈡埛璁㈠崟鍙�;
this.initMainData.HCusModel = dataArray[0].浜у搧鍨嬪彿;
+ this.initMainData.HMTONo = dataArray[0].璁″垝璺熻釜鍙�;
this.initMainData.HMinQty = 0;
if(this.initMainData.HMinQty>0){
this.initMainData.HBQty = (this.initMainData.HQty_SourceBill / this.initMainData.HMinQty) + (this.initMainData.HQty_SourceBill%this.initMainData.HMinQty == 0?0:1);
--
Gitblit v1.9.1