From e8fe0d4c7d418104367a0475c68f261ade6446b3 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 13 一月 2026 20:27:54 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/basicModeling/Gy_MouldFile.vue | 4
src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue | 2
src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue | 27
src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue | 26
src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue | 6
src/views/basic/gyUnit/gyUnit.vue | 510 ++------
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue | 2
src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue | 6
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue | 8
src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue | 18
src/views/basic/gyCurrency/gyCurrency.vue | 21
src/views/logistics/transportGPS/WL_YayBill.vue | 96 +
src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue | 10
src/views/logistics/transportGPS/Add_Edit_WL_YayBill copy.vue | 1193 +++++++++++++++++++++
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 1379 ++++++++++++++++++++++++
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue | 8
src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue | 8
src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue | 6
18 files changed, 2,861 insertions(+), 469 deletions(-)
diff --git a/src/views/basic/gyCurrency/gyCurrency.vue b/src/views/basic/gyCurrency/gyCurrency.vue
index 84d8f57..d386a36 100644
--- a/src/views/basic/gyCurrency/gyCurrency.vue
+++ b/src/views/basic/gyCurrency/gyCurrency.vue
@@ -1164,7 +1164,7 @@
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
- if (this.ids.includes(row.hmainid)) {
+ if (this.ids.includes(row.HItemID)) {
return { background: "#ecf5ff" };
}
},
@@ -1186,11 +1186,22 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
- this.ids = selection.map((item) => item.hmainid);
- this.single = selection.length != 1;
- this.multiple = !selection.length;
- if (!this.single) {
+ if (this.openPage) {
+ //鍒楄〃鍗曢��
+ if (selection.length > 1) {
+ const del_row = selection.shift();
+ this.$refs.tableData.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ this.rowForm = {};
+ this.ids = selection.map((item) => item.HItemID);
this.rowForm = selection[0];
+ } else {
+ this.ids = selection.map((item) => item.HItemID);
+ this.single = selection.length != 1;
+ this.multiple = !selection.length;
+ if (!this.single) {
+ this.rowForm = selection[0];
+ }
}
},
//鎵撳紑渚ц竟鎼滅储寮圭獥
diff --git a/src/views/basic/gyUnit/gyUnit.vue b/src/views/basic/gyUnit/gyUnit.vue
index c65877b..8bb80a0 100644
--- a/src/views/basic/gyUnit/gyUnit.vue
+++ b/src/views/basic/gyUnit/gyUnit.vue
@@ -1,77 +1,33 @@
<template>
- <div style="padding: 10px; position: relative">
- <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="HName">
- <el-input
- v-model="queryParams.HName"
- placeholder="璁￠噺鍗曚綅浠ｇ爜"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.HName" placeholder="璁￠噺鍗曚綅浠ｇ爜" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="璁￠噺鍗曚綅鍚嶇О" prop="HNumber">
- <el-input
- v-model="queryParams.HNumber"
- placeholder="璇疯緭鍏ヨ閲忓崟浣嶅悕绉�"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.HNumber" 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>
@@ -85,132 +41,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>
@@ -221,11 +114,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>
@@ -241,55 +131,26 @@
>
</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))"
- >缂栬緫</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="handleEdit((row = rowForm), (OperationType = 3))">缂栬緫</el-button>
</el-col>
- <el-col :span="1.5"> </el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-delete"
- size="mini"
- :disabled="single"
- @click="handleDelete"
- >鍒犻櫎
+ </el-col>
+ <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-edit"
- size="mini"
- :disabled="single"
- @click="set_CheckBill(1, (form = rowForm))"
- >瀹℃牳</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_CheckBill(1, (form = rowForm))">瀹℃牳</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="set_CheckBill(2, (form = rowForm))"
- >鍙嶅鏍�</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_CheckBill(2, (form = rowForm))">鍙嶅鏍�</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
@@ -315,138 +176,60 @@
</el-col> -->
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="set_De_Stop(0, (form = rowForm))"
- >绂佺敤</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_De_Stop(0, (form = rowForm))">绂佺敤</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="set_De_Stop(1, (form = rowForm))"
- >鍙嶇鐢�</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_De_Stop(1, (form = rowForm))">鍙嶇鐢�</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- >瀵煎嚭</el-button
- >
+ <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"
- >鎼� 绱�</el-button
- >
+ <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch">鎼� 绱�</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
- >閲� 缃�</el-button
- >
+ <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
</el-col>
<!-- <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))"
- v-else-if="column.property == '璁￠噺鍗曚綅浠ｇ爜'"
- >{{ row.璁￠噺鍗曚綅浠ｇ爜 }}</el-button
- >
+ <el-button type="text" @click.stop="handleEdit(row, (OperationType = 3))"
+ 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="handleQuery"
- />
- <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="handleQuery" />
+ <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.hmainid"
@@ -460,93 +243,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
- v-if="false"
- >
+ <el-dialog :title="upload.title" :visible.sync="upload.open" width="1500px" append-to-body v-if="false">
<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>
@@ -871,7 +600,7 @@
params: {
sWhere: this.sWhere,
user: sessionStorage["HUserName"],
- Organization: this.getOrgNameById(this.queryParams.HOrgID),
+ Organization: this.getOrgNameById(this.queryParams.HOrgID)
},
});
this.tyResList = [...JSON.parse(JSON.stringify(res.data.data))]; //鎬绘暟鎹�
@@ -1123,10 +852,13 @@
}
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
+ if (this.openPage) {
+ this.$emit('deptEmit', row, 11)
+ }
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
- if (this.ids.includes(row.hmainid)) {
+ if (this.ids.includes(row.HItemID)) {
return { background: "#ecf5ff" };
}
},
@@ -1143,16 +875,30 @@
return;
}
this.OperationType = 3;
+ if (this.openPage) {
+ this.$emit('deptEmitDb', row, 11)
+ }
this.handleEdit(row, this.OperationType);
},
- // 澶氶�夋閫変腑鏁版嵁
+ // 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
- this.ids = selection.map((item) => item.hmainid);
- this.single = selection.length != 1;
- this.multiple = !selection.length;
- if (!this.single) {
+ if (this.openPage) {
+ //鍒楄〃鍗曢��
+ if (selection.length > 1) {
+ const del_row = selection.shift();
+ this.$refs.tableData.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ this.rowForm = {};
+ this.ids = selection.map((item) => item.HItemID);
this.rowForm = selection[0];
+ } else {
+ this.ids = selection.map((item) => item.HItemID);
+ this.single = selection.length != 1;
+ this.multiple = !selection.length;
+ if (!this.single) {
+ this.rowForm = selection[0];
+ }
}
},
//鎵撳紑渚ц竟鎼滅储寮圭獥
@@ -1374,7 +1120,7 @@
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
}
})
- .catch(() => {});
+ .catch(() => { });
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
@@ -1391,6 +1137,7 @@
.then((res) => {
let result = res.data;
if (result.code == 1) {
+
this.handleQuery();
this.$modal.msgError("閿欒:" + result.code + result.Message);
} else {
@@ -1402,6 +1149,8 @@
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
+
+
// 鍙嶇鐢�/绂佺敤鏁版嵁
set_De_Stop(num, form) {
@@ -1460,8 +1209,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 }
);
@@ -1469,12 +1218,13 @@
},
// 鍋囪鎮ㄦ湁涓�涓粍缁嘔D
+
// 鏂规硶1.1锛氫娇鐢� find 鏂规硶
getOrgNameById(id) {
- const org = this.organizationList.find(
- (item) => item.ID.toString() === id.toString()
+ const org = this.organizationList.find(item =>
+ item.ID.toString() === id.toString()
);
- return org ? org.Name : ""; // 鍙繑鍥炵粍缁囧悕绉�
+ return org ? org.Name : ''; // 鍙繑鍥炵粍缁囧悕绉�
},
// 鎻愪氦涓婁紶鏂囦欢
@@ -1500,8 +1250,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 }
);
@@ -1525,7 +1275,7 @@
return deleteList.indexOf(item.index) == -1;
});
})
- .catch(() => {});
+ .catch(() => { });
},
getPage(page, list) {
let sindex = (parseInt(page) - 1) * this.uploadPageSize;
@@ -1548,7 +1298,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/logistics/transportGPS/Add_Edit_WL_YayBill copy.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill copy.vue
new file mode 100644
index 0000000..8f17c38
--- /dev/null
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill copy.vue
@@ -0,0 +1,1193 @@
+<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 0e9c73f..9e4f8f4 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -1,10 +1,1375 @@
<template>
- <div style="padding: 10px;">
- 2
-</div>
+ <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 />
+ </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(5)"></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(7)"></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(8)"></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(9)"></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(10)"></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(11)"></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(12)"></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(13)"></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(14)"></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" />
+ <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>
- export default {
- name: 'Add_Edit_WL_YayBill',
- }
-</script>
\ No newline at end of file
+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'
+import XsSeOutStockBill from '@/views/sell/XsSeOutStockBill.vue'
+import GyCustomer from '@/views/GyCustomer'
+
+export default {
+ name: 'SellOutBill',
+ components: { Dept, Warehouse, Material, RowSettings, XsSeOutStockBill, GyCustomer },
+ 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)
+ HModName: "Add_Edit_Gy_QCVerificationBill",
+ organizationList: JSON.parse(sessionStorage.getItem('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, //浠撲綅鏁版嵁缁勪欢鏄剧ず鏍囪
+ xsSeOutStockBillShow: false, //鍘熷崟锛堝彂璐ч�氱煡鍗曪級鏁版嵁缁勪欢鏄剧ず鏍囪
+ gyCustomerShow: false, //瀹㈡埛鏁版嵁缁勪欢鏄剧ず鏍囪
+ deptform: {}, //寮圭獥閫変腑鏁版嵁
+
+ temp: undefined, //涓存椂鍙橀噺
+ btResList: [], // 鍒楄缃�
+ form: {}, // 琛ㄥ崟鍙傛暟
+ rules: { // 琛ㄥ崟鏍￠獙
+ HCarrierName: [
+ { required: true, message: "鎵胯繍鍟嗕笉鑳戒负绌�", trigger: "blur" }
+ ],
+ HCusName: [
+ { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HBeginAddrName: [
+ { required: true, message: "濮嬪彂鍦颁笉鑳戒负绌�", trigger: "blur" }
+ ],
+ HEndAddrName: [
+ { 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
+ } else if (num == 7) {
+ this.dialogTitle = '瀹㈡埛鍒楄〃'
+ this.gyCustomerShow = true
+ this.openData = true
+ } else if (num == 12) {
+ this.dialogTitle = '婧愬崟鍒楄〃'
+ this.xsSeOutStockBillShow = true
+ this.openData = true
+ }
+
+ },
+ //#region 灏嗘暟鎹脊绐楀叏閮ㄥ彇娑堝姞杞�
+ showReset() {
+ this.deptShow = false
+ this.warehouseShow = false
+ this.materialShow = false
+ this.gyCustomerShow = false
+ this.xsSeOutStockBillShow = 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
+ } else if (num == 7) {
+ this.form.HCusName = deptRow.瀹㈡埛鍚嶇О
+ this.form.HCusID = deptRow.HItemID
+ this.gyCustomerShow = false
+ this.openData = false
+ } else if (num == 12) { //鐗╂枡
+ this.xsSeOutStockBillShow = false
+ 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/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index 7804c82..d4f100e 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -148,7 +148,23 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CheckBill(1, form = rowForm)">杩斿鏍�</el-button>
+ @click="set_CheckBill(1, form = rowForm)">鍙嶅鏍�</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+ @click="set_CloseBills(1, form = rowForm)">鍏抽棴</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+ @click="set_CloseBills(2, form = rowForm)">鍙嶅叧闂�</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+ @click="set_DropBill(1, form = rowForm)">浣滃簾</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+ @click="set_DropBill(2, form = rowForm)">鍙嶄綔搴�</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
@@ -198,8 +214,7 @@
@pagination="handleQuery" />
<!-- 鍒楄缃� -->
<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"
@@ -329,7 +344,7 @@
rowForm: {}, // 褰撻�変腑鐨勫彧鏈変竴琛屾椂锛屾洿鏂版暟鎹负璇ラ�変腑鐨勮銆�
tyResList: [], // 鍒楄〃鏁版嵁锛岀敤浜庡鍑�
- titleData: ["HInterID", "HEntryID", "HBillStatus", "HMaterID", "HPreventErrMouldID","HOrgID"], // 涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ titleData: ["HInterID", "HEntryID", "HBillStatus", "HMaterID", "HPreventErrMouldID", "HOrgID"], // 涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
btResList: [], // 鍒楄〃琛ㄥご鏁版嵁銆傜敤浜庡垪璁剧疆
dataList: [], // option璁板綍銆傜敤浜庡綋option鏁版嵁鏃犳晥鏃讹紝鐢ㄤ簬鍒楄缃�
};
@@ -623,22 +638,18 @@
//#region 鍒犻櫎
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- if (this.rowForm.鐘舵�� == "鍒涘缓") {
- axios.get(this.baseURL + "/Kf_POStockInBill/DeltetKf_POStockInBill", {
- params: { 'HInterID': this.rowForm.HInterID.toString(), 'user': sessionStorage["HUserName"] }
- }).then(response => {
- if (response.data.count == 1) {
- this.handleQuery()
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
- } else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- } else {
- this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
- }
+ axios.get(this.baseURL + "/Cg_ContractTransportBillListController/DeleteBill", {
+ params: { 'HInterID': this.rowForm.HInterID.toString(), 'user': sessionStorage["HUserName"] }
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.handleQuery()
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+ } else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
}).catch(() => { })
},
//#endregion
@@ -647,12 +658,12 @@
set_CheckBill(num, form) {
var InterID = form.hmainid || form.HInterID
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.baseURL + "/Kf_POStockInBill/AuditKf_POStockInBill", {
+ axios.get(this.baseURL + "/WLYayBillController/AuditWLYayBill", {
params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
if (result.code == 1) {
- this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.$modal.msgSuccess(result.Message);
this.handleQuery();
}
else {
@@ -663,7 +674,46 @@
});
},
//#endregion
-
+ //#region 鍏抽棴/鍙嶅叧闂�
+ set_CloseBills(num) {
+ var InterID = form.hmainid || form.HInterID
+ //閫昏緫瀹℃牳鏂规硶
+ axios.get(this.baseURL + "/Cg_ContractTransportBillEdit/CloseCg_ContractTransportBillEdit", {
+ params: { "HInterID": InterID, "Type": num, "CurUserName": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) {
+ this.$modal.msgSuccess(result.Message);
+ this.handleQuery();
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+ //#region 浣滃簾/鍙嶄綔搴�
+ set_DropBill(num) {
+ var InterID = form.hmainid || form.HInterID
+ //閫昏緫瀹℃牳鏂规硶
+ axios.get(this.baseURL + "/Cg_ContractTransportBillEdit/DropCg_ContractTransportBillEdit", {
+ params: { "HInterID": InterID, "Type": num, "CurUserName": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) {
+ this.$modal.msgSuccess(result.Message);
+ this.handleQuery();
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
//#region 鍒楄缃�
handleRowHide() {
this.rowHideShow = true
diff --git a/src/views/scMould/basicModeling/Gy_MouldFile.vue b/src/views/scMould/basicModeling/Gy_MouldFile.vue
index e45f187..ef0898a 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFile.vue
+++ b/src/views/scMould/basicModeling/Gy_MouldFile.vue
@@ -627,6 +627,7 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
+ HUnitName:[{required: true, message: "鍗曚綅涓嶈兘涓虹┖", trigger: "blur" }],
// HSupName: [
// { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
// ],
@@ -844,7 +845,6 @@
this.gySupplierShow = false
this.openData = false
} else if (num == 7) {
- console.log(deptRow)
this.form.HCusName = deptRow.瀹㈡埛鍚嶇О
this.form.HCusID = deptRow.HItemID
this.gyCustomerShow = false
@@ -860,6 +860,8 @@
this.gyStockPlaceShow = false
this.openData = false
} else if (num == 11){
+ this.form.HUnitName = deptRow.璁￠噺鍗曚綅鍚嶇О;
+ this.form.HUnitID = deptRow.HItemID;
this.gyUnitShow= false
this.openData = false
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
index b912983..be19c5c 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
@@ -19,7 +19,7 @@
</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 v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -35,7 +35,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
- <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+ <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�" @change="form.HSupName='',form.HSupId=0">
<el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
</el-option>
</el-select>
@@ -628,7 +628,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
if (this.OperationType == 1) {
this.handleAddSysZb()
}
@@ -665,7 +665,7 @@
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
} else {
this.form = {
"HBillNo": data.鍗曟嵁鍙�
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
index d8798d7..5a3780a 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
@@ -131,10 +131,10 @@
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
@click="handleEdit(row = rowForm, OperationType = 2)">缂栬緫</el-button>
</el-col>
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
@click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</el-button>
- </el-col>
+ </el-col> -->
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-tickets" size="mini"
@click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堝鍣ㄩ鐢ㄩ��搴撳崟锛�</el-button>
@@ -151,14 +151,14 @@
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
@click="set_CheckBill(2, form = rowForm)">杩斿鏍�</el-button>
</el-col>
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
@click="set_CheckBillAll(1, ids)">瀹℃牳(鎵归噺)</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
@click="set_CheckBillAll(2, ids)">杩斿鏍�(鎵归噺)</el-button>
- </el-col>
+ </el-col> -->
<!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
</el-col> -->
@@ -857,7 +857,7 @@
this.getList()
this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
} else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
+ this.$modal.msgError("閿欒:" + response.data.code + response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
index 3dcbdcd..0c8ca84 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
@@ -19,7 +19,7 @@
</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 v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -35,7 +35,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
- <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+ <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�" @change="form.HSupName='',form.HSupId=0">
<el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
</el-option>
</el-select>
@@ -693,7 +693,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
if (this.OperationType == 1) {
this.handleAddSysZb()
}
@@ -733,7 +733,7 @@
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
} else {
this.form = {
"HBillNo": data.鍗曟嵁鍙�
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
index 063126d..12fa2da 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
@@ -852,7 +852,7 @@
this.getList()
this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
} else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
+ this.$modal.msgError("閿欒:" + response.data.code + response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
index b293a93..36523f2 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
@@ -19,7 +19,7 @@
</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 v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -35,7 +35,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
- <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+ <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�" @change="form.HSupName='',form.HSupId=0">
<el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
</el-option>
</el-select>
@@ -721,7 +721,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
if (this.OperationType == 1) {
this.handleAddSysZb()
}
@@ -758,7 +758,7 @@
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
} else {
this.form = {
"HBillNo": data.鍗曟嵁鍙�
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
index 9befbf0..69b9299 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
@@ -857,7 +857,7 @@
this.getList()
this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
} else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
+ this.$modal.msgError("閿欒:" + response.data.code + response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
index dfb6e00..1455ae6 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
@@ -19,7 +19,7 @@
</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 v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -35,7 +35,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
- <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+ <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�" @change="form.HSupName='',form.HSupId=0">
<el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
</el-option>
</el-select>
@@ -224,12 +224,12 @@
</el-table-column>
<el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.HMaterSpec }}</span>
+ <span>{{ scope.row.HMaterModel }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="璁￠噺鍗曚綅浠ｇ爜" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.HUnitCode }}</span>
+ <span>{{ scope.row.HUnitNumber }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
@@ -261,7 +261,7 @@
</el-table-column>
<el-table-column align="center" label="浠撲綅浠ｇ爜" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.HSPCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row)"
+ <el-input v-model="scope.row.HSPNumber" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row)"
@dblclick.native="openDataDialog(9, scope.row)" />
</template>
</el-table-column>
@@ -573,12 +573,19 @@
this.form.HSupTypeID = data.HSupTypeID
this.form.HSupID = data.HSupID
this.form.HSupName = data.HSupName
- this.form.HSecManagerId = data.HSecManagerID
+ this.form.HEmpID = data.HEmpID
+ this.form.HEmpName = data.HEmpName
+ this.form.HManagerID = data.HManagerID
+ this.form.HManagerName = data.HManagerName
+ this.form.HKeeperID = data.HKeeperID
+ this.form.HKeeperName = data.HKeeperName
+ this.form.HSecManagerID = data.HSecManagerID
this.form.HSecManagerName = data.HSecManagerName
this.form.HDeptID = data.HDeptID
this.form.HDeptName = data.HDeptName
this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID
this.ifOrganizationEdit = true
+ console.log(dataArray)
//瀛愯〃 璧嬪��
var rowdata = [];
for (let i = 0; i < dataArray.length; i++) {
@@ -741,7 +748,7 @@
this.openData = false
} else if (num == 9){
this.editData[this.zbIndex].HSPID = deptRow.HMainID
- this.editData[this.zbIndex].HSPCode = deptRow.浠撲綅浠ｇ爜
+ this.editData[this.zbIndex].HSPNumber = deptRow.浠撲綅浠ｇ爜
this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
this.gyStockPlaceShow = false
this.openData = false
@@ -858,7 +865,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
if (this.OperationType == 1) {
this.handleAddSysZb()
}
@@ -888,7 +895,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
//璁剧疆婧愬崟绫诲瀷
this.form.HSourceBillType = this.HSouceBillType
@@ -928,7 +935,7 @@
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
} else {
if (data[0].HSourceInterID != "0") {
this.ifOrganizationEdit = true
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
index 63b2a18..57e38e9 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
@@ -772,14 +772,14 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- axios.get(this.baseURL + "/Sc_MouldProdBackBill/DeltetMouldProdBackBill", {
- params: { 'HInterID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
+ axios.get(this.baseURL + "/Sc_MouldProdBackBillController/GetSc_MouldProdBackBill_Delete_Json", {
+ params: { 'HInterID': this.rowForm.hmainid.toString(), 'HMaker': sessionStorage["HUserName"] }
}).then(response => {
if (response.data.count == 1) {
this.getList()
this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
} else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
+ this.$modal.msgError("閿欒:" + response.data.code + response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
index a34b084..11e2035 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
@@ -19,7 +19,7 @@
</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 v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -35,7 +35,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
- <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+ <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�" @change="form.HSupName='',form.HSupId=0">
<el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
</el-option>
</el-select>
@@ -622,6 +622,14 @@
this.form.HSupTypeID = data.HSupTypeID
this.form.HSupID = data.HSupID
this.form.HSupName = data.HSupName
+ this.form.HEmpID = data.HEmpID
+ this.form.HEmpName = data.HEmpName
+ this.form.HManagerID = data.HManagerID
+ this.form.HManagerName = data.HManagerName
+ this.form.HKeeperID = data.HKeeperID
+ this.form.HKeeperName = data.HKeeperName
+ this.form.HSecManagerID = data.HSecManagerID
+ this.form.HSecManagerName = data.HSecManagerName
this.form.HDeptID = data.HDeptID
this.form.HDeptName = data.HDeptName
this.form.HStockOrgID = data.HStockOutOrgID
@@ -930,7 +938,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
if (this.OperationType == 1) {
this.handleAddSysZb()
}
@@ -960,7 +968,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
//璁剧疆婧愬崟绫诲瀷
this.form.HSourceBillType = this.HSouceBillType
@@ -1000,7 +1008,7 @@
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
} else {
if (data[0].HSourceInterID != "0") {
this.ifOrganizationEdit = true
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
index fc5263f..a6752cc 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
@@ -773,14 +773,14 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- axios.get(this.baseURL + "/Sc_MouldProdMoveBill/DeltetMouldProdMoveBill", {
- params: { 'HInterID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
+ axios.get(this.baseURL + "/Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Delete_Json", {
+ params: { 'HInterID': this.rowForm.hmainid.toString(), 'HMaker': sessionStorage["HUserName"] }
}).then(response => {
if (response.data.count == 1) {
this.getList()
this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
} else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
+ this.$modal.msgError("閿欒:" + response.data.code + response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
index 4aa8b9b..a365cb8 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
@@ -19,7 +19,7 @@
</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 v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -35,7 +35,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
- <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+ <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�" @change="form.HSupName='',form.HSupId=0">
<el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
</el-option>
</el-select>
@@ -224,12 +224,12 @@
</el-table-column>
<el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.HMaterSpec }}</span>
+ <span>{{ scope.row.HMaterModel }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="璁￠噺鍗曚綅浠ｇ爜" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.HUnitCode }}</span>
+ <span>{{ scope.row.HUnitNumber }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
@@ -261,7 +261,7 @@
</el-table-column>
<el-table-column align="center" label="浠撲綅浠ｇ爜" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.HSPCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row)"
+ <el-input v-model="scope.row.HSPNumber" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row)"
@dblclick.native="openDataDialog(9, scope.row)" />
</template>
</el-table-column>
@@ -573,7 +573,13 @@
this.form.HSupTypeID = data.HSupTypeID
this.form.HSupID = data.HSupID
this.form.HSupName = data.HSupName
- this.form.HSecManagerId = data.HSecManagerID
+ this.form.HEmpID = data.HEmpID
+ this.form.HEmpName = data.HEmpName
+ this.form.HManagerID = data.HManagerID
+ this.form.HManagerName = data.HManagerName
+ this.form.HKeeperID = data.HKeeperID
+ this.form.HKeeperName = data.HKeeperName
+ this.form.HSecManagerID = data.HSecManagerID
this.form.HSecManagerName = data.HSecManagerName
this.form.HDeptID = data.HDeptID
this.form.HDeptName = data.HDeptName
@@ -741,7 +747,7 @@
this.openData = false
} else if (num == 9){
this.editData[this.zbIndex].HSPID = deptRow.HMainID
- this.editData[this.zbIndex].HSPCode = deptRow.浠撲綅浠ｇ爜
+ this.editData[this.zbIndex].HSPNumber = deptRow.浠撲綅浠ｇ爜
this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
this.gyStockPlaceShow = false
this.openData = false
@@ -857,7 +863,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
if (this.OperationType == 1) {
this.handleAddSysZb()
}
@@ -887,7 +893,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
//璁剧疆婧愬崟绫诲瀷
this.form.HSourceBillType = this.HSouceBillType
@@ -927,7 +933,7 @@
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
} else {
if (data[0].HSourceInterID != "0") {
this.ifOrganizationEdit = true
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
index 11db684..abfe3b1 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
@@ -772,14 +772,14 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- axios.get(this.baseURL + "/Sc_MouldProdOutBill/DeltetMouldProdOutBill", {
- params: { 'HInterID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
+ axios.get(this.baseURL + "/Sc_MouldProdOutBillController/GetSc_MouldProdOutBill_Delete_Json", {
+ params: { 'HInterID': this.rowForm.hmainid.toString(), 'HMaker': sessionStorage["HUserName"] }
}).then(response => {
if (response.data.count == 1) {
this.getList()
this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
} else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
+ this.$modal.msgError("閿欒:" + response.data.code + response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
--
Gitblit v1.9.1