From 84bc1af19f5dded03d1bbdf89be546b35bf115b9 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 一月 2026 15:13:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue | 14
src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue | 14
src/views/basic/gyCar/gyCarList.vue | 525 ++---------
src/views/basic/gyStockPlace/gyStockPlace.vue | 8
src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranEdit.vue | 918 +++++++++++++++++++++
src/store/modules/permission.js | 26
src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList.vue | 835 +++++++++++++++++++
src/views/component/AreaDialog/index.vue | 2
src/router/index.js | 20
src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue | 26
.env.development | 6
src/views/basic/gyCartypelist/gyCartypelist.vue | 5
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 138 ++
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue | 1
14 files changed, 2,073 insertions(+), 465 deletions(-)
diff --git a/.env.development b/.env.development
index a618dca..0a25c86 100644
--- a/.env.development
+++ b/.env.development
@@ -5,10 +5,10 @@
ENV = 'development'
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/寮�鍙戠幆澧�
-# VUE_APP_BASE_API = http://localhost:81/API/
-# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
+# # VUE_APP_BASE_API = http://localhost:81/API/
+VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
-# VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
+VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
#閿﹂殕
# VUE_APP_BASE_API_INNER = 'http://192.168.1.11/API/'
# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
diff --git a/src/router/index.js b/src/router/index.js
index 45714ed..0c69b55 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1811,6 +1811,26 @@
//#region 鐗╂祦绠＄悊
//#region 杩愯緭瀹氫綅
+ //#region 杩愬崟璐圭敤缁撶畻鍗曞垪琛�
+ {
+ path: "logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/logistics/WayBillPaymentBill", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList",
+ component: () => import("@/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList.vue"),
+ name: "yf_PayMentOtherBillTranList",
+ meta: { title: "杩愬崟璐圭敤缁撶畻鍗�", activeMenu: "logistics/WayBillPaymentBill" },
+ },
+ ],
+ },
+ //#endregion
//#region 杩愬崟鍒楄〃
{
path: "logistics/transportGPS/WL_YayBill",
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 923ec59..0123393 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -74,19 +74,19 @@
name: "WL_YayBill",
path: "WL_YayBill",
},
- // {
- // meta: {
- // icon: "build",
- // link: null,
- // noCache: false,
- // title: "杩愬崟缂栬緫",
- // },
- // component: () =>
- // import("@/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue"),
- // hidden: false,
- // name: "Add_Edit_WL_YayBill",
- // path: "Add_Edit_WL_YayBill",
- // },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "杩愬崟璐圭敤缁撶畻鍗�",
+ },
+ component: () =>
+ import("@/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList.vue"),
+ hidden: false,
+ name: "yf_PayMentOtherBillTranList",
+ path: "YF_PayMentOtherBillTranList",
+ },
],
},
],
diff --git a/src/views/basic/gyCar/gyCarList.vue b/src/views/basic/gyCar/gyCarList.vue
index a17b3ea..3d9099a 100644
--- a/src/views/basic/gyCar/gyCarList.vue
+++ b/src/views/basic/gyCar/gyCarList.vue
@@ -1,77 +1,33 @@
<template>
- <div style="padding: 10px">
- <el-form
- :model="queryParams"
- ref="queryForm"
- size="small"
- :inline="true"
- label-width="78px"
- class="searchBox"
- >
+ <div style="padding: 10px; position: relative;">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
<el-row>
<el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
- <el-date-picker
- v-model="sTime"
- type="date"
- placeholder="寮�濮嬫棩鏈�"
- style="width: 150px"
- :disabled="queryParams.HInitTimeCycle != -1"
- value-format="yyyy-MM-dd"
- >
+ <el-date-picker v-model="sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="缁撴潫鏃ユ湡">
- <el-date-picker
- v-model="eTime"
- type="date"
- placeholder="缁撴潫鏃ユ湡"
- style="width: 150px"
- :disabled="queryParams.HInitTimeCycle != -1"
- value-format="yyyy-MM-dd"
- >
+ <el-date-picker v-model="eTime" type="date" placeholder="缁撴潫鏃ユ湡" style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="鏃ユ湡闂撮殧">
- <el-select
- v-model="queryParams.HInitTimeCycle"
- placeholder="璇烽�夋嫨"
- @change="riqiChange"
- >
- <el-option
- v-for="(item, index) in rqsgList"
- :key="index"
- :label="item.label"
- :value="item.value"
- >
+ <el-select v-model="queryParams.HInitTimeCycle" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-option v-for="(item, index) in rqsgList" :key="index" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="杞﹁締鍚嶇О" prop="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,64 +131,28 @@
>
</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-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 2))"
- >澶嶅埗</el-button
- >
+ <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-button
- type="primary"
- icon="el-icon-delete"
- size="mini"
- :disabled="single"
- @click="handleDelete"
- >鍒犻櫎
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="set_CheckBill(0, (form = rowForm))"
- >瀹℃牳</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_CheckBill(0, (form = rowForm))">瀹℃牳</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-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
@@ -323,178 +177,76 @@
>
</el-col> -->
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="set_CloseBill(1, (form = rowForm))"
- >鍏抽棴</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_CloseBill(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_CloseBill(2, (form = rowForm))"
- >鍙嶅叧闂�</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_CloseBill(2, (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_CloseRow(0, (form = rowForm))"
- >琛屽叧闂�</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_CloseRow(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_CloseRow(1, (form = rowForm))"
- >琛屽弽鍏抽棴</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_CloseRow(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_DropBill(1, (form = rowForm))"
- >浣滃簾</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" 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"
- size="mini"
- :disabled="single"
- @click="set_DropBill(2, (form = rowForm))"
- >鍙嶄綔搴�</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" 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
- >
+ <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"
@@ -508,93 +260,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>
@@ -1177,6 +875,9 @@
}
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
+ if (this.openPage) {
+ this.$emit('deptEmit', row, 14)
+ }
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
@@ -1197,7 +898,11 @@
return;
}
this.OperationType = 3;
- this.handleEdit(row, this.OperationType);
+ if (this.openPage) {
+ this.$emit('deptEmitDb', row, 14)
+ } else {
+ this.handleEdit(row, this.OperationType);
+ }
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -1427,7 +1132,7 @@
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
}
})
- .catch(() => {});
+ .catch(() => { });
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
@@ -1591,8 +1296,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 }
);
@@ -1621,8 +1326,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 }
);
@@ -1646,7 +1351,7 @@
return deleteList.indexOf(item.index) == -1;
});
})
- .catch(() => {});
+ .catch(() => { });
},
getPage(page, list) {
let sindex = (parseInt(page) - 1) * this.uploadPageSize;
@@ -1669,7 +1374,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/basic/gyCartypelist/gyCartypelist.vue b/src/views/basic/gyCartypelist/gyCartypelist.vue
index e05f100..0c9388c 100644
--- a/src/views/basic/gyCartypelist/gyCartypelist.vue
+++ b/src/views/basic/gyCartypelist/gyCartypelist.vue
@@ -175,6 +175,7 @@
components: { RowSettings, Edit },
props: {
openPage: { type: String, },
+ volume:{},
},
data() {
return {
@@ -434,7 +435,7 @@
this.$refs.tableData.toggleRowSelection(row);
if (this.openPage) {
//this.$emit('carTypeEmit', row, 1)
- this.$emit('deptEmitDb', row, 7)
+ this.$emit('deptEmit', row, 13)
}
},
@@ -457,7 +458,7 @@
this.OperationType = 3
if (this.openPage) {
//this.$emit('carTypeEmitDb', row, 1)
- this.$emit('deptEmitDb', row, 7)
+ this.$emit('deptEmitDb', row, 13)
} else {
this.handleEdit();
}
diff --git a/src/views/basic/gyStockPlace/gyStockPlace.vue b/src/views/basic/gyStockPlace/gyStockPlace.vue
index 32f4bc2..69b7b72 100644
--- a/src/views/basic/gyStockPlace/gyStockPlace.vue
+++ b/src/views/basic/gyStockPlace/gyStockPlace.vue
@@ -459,6 +459,7 @@
components: { RowSettings, Edit, GyStockPlace, PrintList },
props: {
openPage: { type: String },
+ openPageData: { type: Object },
},
data() {
return {
@@ -605,8 +606,13 @@
};
},
created() {
- this.handleQuery();
this.riqiChange();
+ if(this.openPageData){
+ this.queryParams.HWHName = this.openPageData.HWHName
+ this.handleQuery();
+ }else{
+ this.handleQuery();
+ }
},
methods: {
beforeEditCloseHandler() {
diff --git a/src/views/component/AreaDialog/index.vue b/src/views/component/AreaDialog/index.vue
index edeb50d..719b6d2 100644
--- a/src/views/component/AreaDialog/index.vue
+++ b/src/views/component/AreaDialog/index.vue
@@ -216,6 +216,8 @@
components: { RowSettings, Edit },
props: {
openPage: { type: String, },
+ HBeginAddrName: { type: String, },
+ HEndAddrName: { type: String, },
},
data() {
return {
diff --git a/src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranEdit.vue b/src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranEdit.vue
new file mode 100644
index 0000000..be1b4fc
--- /dev/null
+++ b/src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranEdit.vue
@@ -0,0 +1,918 @@
+<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="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="HInnerBillNo">
+ <el-input v-model="form.HInnerBillNo" placeholder="璇疯緭鍏ヨ緟鍔╁瓧娈�" />
+ </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"
+ @click="openDataDialog(4, zhiyuanType = 'yewuyuan')"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="淇濈鍛�" prop="HKeeperName">
+ <el-input v-model="form.HKeeperName" placeholder="璇疯緭鍏ヤ繚绠″憳" disabled>
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(4, zhiyuanType = 'baoguanyuan')"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="涓荤" prop="HMangerName">
+ <el-input v-model="form.HMangerName" placeholder="璇疯緭鍏ヤ富绠�" disabled>
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(4, zhiyuanType = 'zhuguan')"></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"
+ @click="openDataDialog(4, zhiyuanType = 'yanshou')"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="浠撳簱" prop="HWHName">
+ <el-input v-model="form.HWHName" placeholder="璇疯緭鍏ヤ粨搴�" disabled>
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(2, ckType = 'form')"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <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-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"
+ @click="openDataDialog(6)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="澶囨敞" prop="HRemark">
+ <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </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">
+ <el-input v-model="scope.row.璁￠噺鍗曚綅" placeholder="璇疯緭鍏ヨ閲忓崟浣�"
+ @keyup.native.f7="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'jldw')"
+ @dblclick.native="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'jldw')" />
+ </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, ckType = 'zb')"
+ @dblclick.native="openDataDialog(2, scope.row, ckType = 'zb')" />
+ </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(9, scope.row)"
+ @dblclick.native="openDataDialog(9, 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('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'kcfdw')"
+ @dblclick.native="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'kcfdw')" />
+ </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('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'jbdw')"
+ @dblclick.native="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'jbdw')" />
+ </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('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'fdw')"
+ @dblclick.native="openDataDialog('鍗曚綅椤甸潰杩樻病鏈�', scope.row, dwType = 'fdw')" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="搴旀敹鏁伴噺" width="120">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.HQtyMust" :min="1" 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="1" 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.HMoney }}</span>
+ </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" :openPage="HModName" v-if="deptShow" />
+ <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="warehouseShow" />
+ <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="materialShow" />
+ <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
+ <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
+ <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
+ <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="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import axios from 'axios'
+import RowSettings from '@/views/component/rowSettings'
+import Dept from '@/views/basic/gy/gyDepartment.vue'
+import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
+import Material from '@/views/gyMaterial/GyMaterial.vue'
+import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import GySupplier from '@/views/basic/gy/gySupplier.vue'
+import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
+import moment from 'moment';
+
+export default {
+ name: 'Kf_StockOutRequestBill',
+ components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GySupplier, GyStockPlace },
+ props: {
+ OperationType: { type: Number, },
+ linterid: { type: Number, },
+ HSouceBillType: { type: String, },
+ propsData: { type: String, },
+ copyType: { type: Number, },
+ },
+ data() {
+ return {
+ HModName: "Kf_StockOutRequestBill",
+ allVal: undefined,
+ zhiyuanType: '',
+ ckType: '',
+ formShow: false,
+ temp: undefined,
+ formLoading: true,
+ zzSelDis: false,
+ rowHideShow: false,
+ openRowHide: false,
+ hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
+ addBtnShow: false,
+ zbIndex: null,
+ zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
+ dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+ deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
+ warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
+ materialShow: false,//鐗╂枡鏁版嵁缁勪欢
+ gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
+ gySupplierShow: false,
+ gyStockPlaceShow: false,
+ deptform: {},//寮圭獥閫変腑鏁版嵁
+ openData: false,//鏁版嵁寮圭獥
+ dialogTitle: '',
+ organizationList: [],//缁勭粐鍒楄〃
+ subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+ // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+ HInterID: null,
+ baseURL: process.env.VUE_APP_BASE_API,
+ checkedSysZb: [],
+ editData: [],//閿�鍞嚭搴撳崟瀛愯〃
+ editBtData: [],//瀛愯〃琛ㄥご
+ activeName: 'first',
+ // 寮瑰嚭灞傛爣棰�
+ 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,
+ // 閬僵灞�
+ loading: true,
+ btResList: [],
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+
+ HDate: [
+ { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HExRate: [
+ { required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }
+ ]
+ }
+ };
+ },
+ created() {
+ this.fetchData()
+ this.getdata()
+ },
+ methods: {
+ fetchData() {
+ axios.get(this.$baseUrl + "/Web/GetOrganizations", {
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.organizationList = response.data.data;//缁勭粐鍒楄〃
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ getdata() {
+ this.formShow = false
+ this.formLoading = true
+ if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
+ this.handleAdd()
+ } else if (this.OperationType == 3 || this.copyType == 1) {
+ this.handleUpdate()
+ }
+ },
+ // 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
+ getUrlVars_JSON() {
+ var datajson;
+ var str = this.propsData; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+ var arr = str.substring(str.lastIndexOf("=") + 1);
+ datajson = JSON.parse(decodeURI(arr));
+ return datajson;
+ },
+ //鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞鍗曟暟鎹�
+ 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("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ handleRowHide() {
+ this.rowHideShow = true
+ this.openRowHide = true
+ },
+ rowSetClose(val) {
+ this.rowHideShow = false
+ this.openRowHide = val
+ },
+
+ organizationChange(val) {
+ // let options=undefined
+ // this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+ },
+ //閮ㄩ棬寮圭獥璧嬪��
+ dbEmitData(deptRow, num) {
+ // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
+ if (deptRow.HItemID) {
+ if (num == 1) {
+ this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
+ this.form.HDeptID = deptRow.HItemID
+ this.deptShow = false
+ this.openData = false
+ } else if (num == 2) {
+ if (this.ckType == 'form') {
+ this.form.HWHID = deptRow.HItemID;
+ this.form.HWHName = deptRow.浠撳簱鍚嶇О;
+ } else if (this.ckType == 'zb') {
+ this.editData[this.zbIndex].HWHID = deptRow.HItemID;
+ this.editData[this.zbIndex].浠撳簱 = deptRow.浠撳簱鍚嶇О;
+ }
+ this.warehouseShow = false
+ 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.materialShow = false
+ this.openData = false
+ } else if (num == 4) {
+ if (this.zhiyuanType == 'yewuyuan') {
+ this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
+ this.form.HEmpID = deptRow.HItemID
+ } else if (this.zhiyuanType == 'baoguanyuan') {
+ this.form.HKeeperName = deptRow.鑱屽憳鍚嶇О
+ this.form.HKeeperID = deptRow.HItemID
+ } else if (this.zhiyuanType == 'zhuguan') {
+ this.form.HMangerName = deptRow.鑱屽憳鍚嶇О
+ this.form.HMangerID = deptRow.HItemID
+ } else if (this.zhiyuanType == 'yanshou') {
+ this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
+ this.form.HSecManagerID = deptRow.HItemID
+ }
+ this.gyEmployeeShow = false
+ this.openData = false
+ } else if (num == 6) {
+ this.form.HSupName = deptRow.渚涘簲鍟嗗悕绉�
+ this.form.HSupID = deptRow.HItemID
+ this.gySupplierShow = false
+ this.openData = false
+ } else if (num == 9) {
+ this.editData[this.zbIndex].HSPID = deptRow.HMainID;
+ this.editData[this.zbIndex].浠撲綅 = deptRow.浠撲綅鍚嶇О;
+ this.gyStockPlaceShow = false
+ this.openData = false
+ }
+ } else {
+ this.$modal.msgError("璇烽�夋嫨鍗曟潯鏁版嵁!");
+ }
+
+ },
+ emitData(deptRow, num) {
+ this.dialogTypeNum = num
+ this.deptform = deptRow
+ },
+ deptClickSub() {
+ this.dbEmitData(this.deptform, this.dialogTypeNum)
+ this.deptform = {}
+ },
+ deptClose() {
+ this.deptform = {}
+ this.openData = false
+ },
+
+ //閿�鍞嚭搴撳崟鏂板缂栬緫琛ㄥ崟鍒濆鍖�
+ reset() {
+ this.form = {
+ HBillNo:'',
+ HDate: moment(new Date()).format('YYYY-MM-DD'),
+ HSSDate:moment(new Date()).format('YYYY-MM-DD'),
+ HAddress:'',
+ HDeptName:'',
+ HDeptID:0,
+ HSupID:0,
+ HSupName:'',
+ HEmpID:0,
+ HEmpName:'',
+ HCurID:0,
+ HCurName:'',
+ HExRate:'',
+ HManagerName:'',
+ HManagerID:0,
+ HPSStyleID:0,
+ HPSStyleName:'',
+ HSSID:0,
+ HSSName:'',
+ HLinkMan:'',
+ HLinkPhone:'',
+ HInnerBillNo:'',
+ HRemark:'',
+ HMaker:sessionStorage["HSupName"],
+ HChecker:'',
+ HCloseMan:'',
+ HMakeDate:'',
+ HCheckDate:'',
+ HCloseDate:'',
+ HUpDateDate:'',
+ HDeleteDate:'',
+
+ }
+ this.editData = []
+ this.editBtData = []
+ this.ids = []
+ this.subDisabled = false
+ this.addBtnShow = false
+ // this.$refs.tableData.clearSelection()
+ this.activeName = 'first'
+ this.resetForm("form");
+ },
+ //閫�鍑�
+ close() {
+ this.reset()
+ if (!this.OperationType && !this.copyType) {
+ const obj = { fullPath: this.$route.path, path: this.$route.path, name: this.$route.name, };
+ this.$tab.closePage(obj).then(res => {
+ const latestView = res.visitedViews.slice(-1)[0]
+ if (latestView) {
+ this.$router.push(latestView.fullPath)
+ } else {
+ if (obj.name === 'Dashboard') {
+ this.$router.replace({ path: '/redirect' + obj.fullPath })
+ } else {
+ this.$router.push('/')
+ }
+ }
+ });
+ } else {
+ this.formShow = false
+ this.$emit('editClose', false)
+ }
+ },
+ //鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
+ 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("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ this.reset()
+ //鏂板鑾峰彇鍗曟嵁鍙�
+ this.getHBillNo()
+ this.form.HDate = moment(new Date()).format('YYYY-MM-DDTHH:mm:ss')
+ if (this.OperationType == 1) {
+ this.handleAddSysZb()
+ }
+ this.$nextTick(() => {
+ this.formShow = true
+ this.formLoading = false
+ })
+ },
+ getHBillNo() {
+ axios.get(this.$baseUrl + "/Web/GetMAXNum", {
+ params: {
+ HBillType: '1242'
+ }
+ }).then(response => {
+ this.form.HMaker = sessionStorage["HUserName"]
+ this.form.HBillNo = response.data.data[0].HBillNo
+ this.form.HInterID = response.data.data[0].HInterID
+ // this.copyType = 0
+ // this.getCzyglByUser()
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+
+
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate() {
+ this.reset()
+ let rowHmainid = this.linterid
+ axios.get(this.$baseUrl + "/Kf_StockOutRequestBill/cx", {
+ params: { 'HInterID': rowHmainid }
+ }).then(response => {
+ if (response.data.count == 1) {
+ var result = response.data
+ var data = response.data.data[0]
+ this.allVal = data
+ this.form.BillType = data.HSourceBillType
+ if (this.copyType == 1) {
+ this.getHBillNo()
+ let date = new Date()
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
+ } else {
+ this.form.HBillNo = data.鍗曟嵁鍙�
+ // this.form.HInterID = data.HInterID
+ 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.HAddress = data.浜よ揣鍦扮偣
+ this.form.HDeptName = data.閮ㄩ棬
+ this.form.HDeptID = data.HDeptID
+ this.form.HSupID = data.HSupID
+ this.form.HSupName = data.渚涘簲鍟�
+ this.form.HEmpID = data.HEmpID
+ this.form.HEmpName = data.涓氬姟鍛�
+ this.form.HCurID = data.HCurID
+ this.form.HCurName = data.甯佸埆
+ this.form.HExRate = data.姹囩巼
+ this.form.HManagerName = data.涓荤
+ this.form.HManagerID = data.HManagerID
+ this.form.HPSStyleID = data.HPSStyleID
+ this.form.HPSStyleName = data.閲囪喘鏂瑰紡
+ this.form.HSSID = data.HSSID
+ this.form.HSSName = data.缁撶畻鏂瑰紡
+ this.form.HLinkMan = data.鑱旂郴浜�
+ this.form.HLinkPhone = data.鑱旂郴鐢佃瘽
+ this.form.HInnerBillNo = data.杈呭姪瀛楁
+ this.form.HRemark = data.琛ㄥご澶囨敞
+ this.form.HWHName = data['浠撳簱']
+ this.form.HWHID = data['HWHID']
+ 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].璁￠噺鍗曚綅,
+ "HQty": result.data[i].鏁伴噺,
+ "HRemark": result.data[i].琛ㄤ綋澶囨敞,
+ "HPrice": result.data[i].鍗曚环,
+ "HMoney": result.data[i].閲戦,
+ "HTaxRate": result.data[i].绋庣巼,
+ "HTaxMoney": result.data[i].閲戦 * result.data[i].绋庣巼,
+ "HlineTotal": result.data[i].閲戦 + result.data[i].绋庨,
+ "HlineTotalBB": (result.data[i].閲戦 + result.data[i].绋庨) * result.data[i].姹囩巼, "HTaxPrice": result.data[i].鍚◣鍗曚环,
+ "HDiscountRate": result.data[i].鎶樻墸鐜�,
+ "HRelTaxPrice": data.瀹為檯鍚◣鍗曚环,
+ "浠撳簱": data.浠撳簱,
+ "HDate": moment(result.data[i].浜よ揣鏃ユ湡).format('YYYY-MM-DD'),
+ "HQtyMust": data.瀹炴敹鏁伴噺,
+ "HQty": data.搴旀敹鏁伴噺
+ }
+ );
+ }
+ this.formShow = true
+ this.formLoading = false
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ /** 瀛愯〃鏄庣粏搴忓彿 */
+ rowSysZbIndex({ row, rowIndex }) {
+ row.index = rowIndex + 1;
+ },
+ /** 缂栬緫椤靛瓙琛ㄦ坊鍔犳寜閽搷浣� */
+ handleAddSysZb(index, num) {
+ if (num == 1 && !index) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
+ } else {
+ let obj = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "浠撳簱": "",
+ "HSPID": 0, "浠撲綅": "", "HSecUnitID": 0, "搴撳瓨杈呭崟浣�": "", "HBASEUNITID": 0, "鍩烘湰鍗曚綅": "",
+ "HEXTAUXUNITID": 0, "杈呭崟浣�": "", "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HRemark": ""
+ }
+ if (index) {
+ this.editData.splice(index, 0, obj);
+ this.$set(this.editData, index, obj)
+ } else {
+ this.editData.push(obj);
+ }
+ }
+ },
+ handleCopyZbRow() {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
+ this.editData.push(copyRow);
+ }
+ },
+ 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);
+ }
+ }
+ },
+ 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);
+ }
+ }
+ },
+ /** 缂栬緫椤靛瓙琛ㄥ垹闄ゆ寜閽搷浣� */
+ 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
+ });
+ }
+ },
+ /** 缂栬緫椤靛瓙琛ㄥ閫夋閫変腑鏁版嵁 */
+ 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) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ },
+
+ // 缂栬緫鎻愪氦淇濆瓨
+ 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 sAllStr = JSON.stringify(this.allVal)
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + this.OperationType + ";" + sessionStorage["HUserName"] + ';' + sAllStr;
+ axios({
+ method: 'post',
+ url: this.$baseUrl + "/Kf_StockOutRequestBill/StockOutRequestBillEdit",
+ data: {
+ 'sMainSub': sMainSub
+ },
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+ this.$modal.msgSuccess(response.data.Message);
+ this.close()
+ } else {
+ this.$modal.msgError(response.data.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }
+ })
+ }
+ });
+ },
+ // 鍙嶅鏍�/瀹℃牳鏁版嵁
+ 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("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ showReset() {
+ this.deptShow = false
+ this.warehouseShow = false
+ this.materialShow = false
+ this.gyEmployeeShow = false
+ this.gySupplierShow = false
+ this.gyStockPlaceShow = false
+ },
+ // 鎵撳紑鏁版嵁鍒楄〃寮圭獥
+ openDataDialog(num, row) {
+ //num1閮ㄩ棬锛�2鍑哄簱浠撳簱锛�3鐗╂枡锛�4閿�鍞憳
+ 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.gyEmployeeShow = true
+ this.openData = true
+ } else if (num == 6) {
+ this.dialogTitle = '寰�鏉ュ崟浣嶅垪琛�'
+ this.gySupplierShow = true
+ this.openData = true
+ } else if (num == 9) {
+ this.dialogTitle = '寰�鏉ュ崟浣嶅垪琛�'
+ this.gyStockPlaceShow = true
+ this.openData = true
+ }
+
+ },
+ }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+ width: 100%;
+}
+</style>
diff --git a/src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList.vue b/src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList.vue
new file mode 100644
index 0000000..215cd36
--- /dev/null
+++ b/src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList.vue
@@ -0,0 +1,835 @@
+<template>
+ <div style="padding: 10px; position: relative;">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
+ <el-form-item label="鍗曟嵁鍙�" prop="HBillNo" style="margin-left: 100px">
+ <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鏃ユ湡闂撮殧">
+ <el-select v-model="queryParams.HInitTimeCycle" placeholder="璇烽�夋嫨" @change="riqiChange"
+ style="width: 150px">
+ <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="寮�濮嬫棩鏈�">
+ <el-date-picker v-model="sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃ユ湡">
+ <el-date-picker v-model="eTime" type="date" placeholder="缁撴潫鏃ユ湡" style="width: 150px">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label-width="78px">
+ <el-button type="primary" icon="el-icon-search" @click="handleQuery">
+ 鎼� 绱�</el-button>
+ <el-button icon="el-icon-circle-close" @click="resetQuery">閲� 缃�</el-button>
+ </el-form-item>
+ <el-collapse v-model="activeSeach">
+ <el-collapse-item title="鏇村" name="1">
+ <el-card class="box-card">
+ <el-form-item label="閮ㄩ棬鍚嶇О" prop="HDepartName">
+ <el-input v-model="queryParams.HDepartName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�"
+ @keyup.enter.native="HDepartName" />
+ </el-form-item>
+ <el-form-item label="鐗╂枡浠ｇ爜" prop="HMaterNumber">
+ <el-input v-model="queryParams.HMaterNumber" placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�"
+ @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鐗╂枡鍚嶇О" prop="HMaterName">
+ <el-input v-model="queryParams.HMaterName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�"
+ @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="浠撳簱" prop="HWHID">
+ <el-input v-model="queryParams.HWHID" placeholder="璇疯緭鍏ヤ粨搴�"
+ @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <div slot="header" class="clearfix"><span>杩囨护</span></div>
+ <div>
+ <el-row>
+ <el-form-item label-width="0">
+ <el-row>
+ <el-col :span="7">
+ <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨"
+ @change="riqiChange">
+ <span v-for="(item, index) in btList" :key="index">
+ <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">
+ <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" />
+ </el-col>
+ </el-row>
+ </el-form-item>
+ </el-row>
+ <el-row>
+ <el-form-item label-width="0">
+ <el-row>
+ <el-col :span="7">
+ <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨"
+ @change="riqiChange">
+ <span v-for="(item, index) in btList" :key="index">
+ <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">
+ <span v-for="(item, index) in btList" :key="index">
+ <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" />
+ </el-col>
+ </el-row>
+ </el-form-item>
+ </el-row>
+ <el-form-item label-width="0">
+ <el-row>
+ <el-col :span="7">
+ <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <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">
+ <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" />
+ </el-col>
+ </el-row>
+ </el-form-item>
+ </div>
+ </el-card>
+ </el-collapse-item>
+ </el-collapse>
+ </el-form>
+ <el-row :gutter="10" class="mb8" style="margin-top: 10px">
+ <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-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-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-date" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
+ </el-col>
+ </el-row>
+ <div class="tableBox" v-loading="loading">
+ <el-table :data="tableData" ref="tableData" max-height="710" :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.id" 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="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="getList" />
+ <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+ <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+ </el-dialog>
+ <!-- 缂栬緫 -->
+ <el-dialog title="缂栬緫" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
+ @close="close">
+ <edit :OperationType="OperationType" :linterid="this.rowForm.hmainid"
+ :HSouceBillType="this.rowForm.HSourceBillType" :copyType="copyType" @editClose="editClose"
+ v-if="editShow" />
+ </el-dialog>
+ </div>
+ </div>
+</template>
+
+<script>
+import axios from "axios";
+import RowSettings from "@/views/component/rowSettings";
+import Edit from "@/views/warehouse/shipment/Kf_StockOutRequestBill.vue";
+import PrintList from "@/views/component/printList";
+import BarCodeDetail from '@/views/component/BarCodeDetail' //鏉＄爜鏄庣粏缁勪欢
+import moment from "moment";
+
+export default {
+ name: "Kf_StockOutRequestBillList",
+ components: { RowSettings, Edit, PrintList, BarCodeDetail },
+ data() {
+ return {
+ activeSeach: "",
+ HModName: "Kf_StockOutRequestBillList",
+ editShow: false,
+ openEdit: false,
+ totalNameList: [],
+ tableShow: true,
+ openPrintList: false,
+ printListShow: false,
+ barCodeDetailShow: false, //鏉＄爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
+ openBtnHide: false,
+ btnHideShow: false,
+ rowHideShow: false,
+ openRowHide: false,
+ copyType: 0,
+ comparatorList: [
+ { label: "=", value: "=" },
+ { label: ">=", value: ">=" },
+ { label: ">", value: ">" },
+ { label: "<=", value: "<=" },
+ { label: "<", value: "<" },
+ { label: "<>", value: "<>" },
+ { label: "鍖呭惈", value: "7" },
+ { label: "宸﹀寘鍚�", value: "8" },
+ { label: "鍙冲寘鍚�", value: "9" },
+ { label: "涓嶅寘鍚�", value: "10" },
+ ],
+ sWhere: "",
+ sTime: "",
+ eTime: "",
+ rqsgList: [
+ { label: "浠婂ぉ", value: 0 },
+ { label: "杩戜袱澶�", value: 1 },
+ { label: "杩戜笁澶�", value: 2 },
+ { label: "杩戝洓澶�", value: 3 },
+ { label: "杩戜簲澶�", value: 4 },
+ { label: "杩戝叚澶�", value: 5 },
+ { label: "杩戜竷澶�", value: 6 },
+ { label: "杩�30澶�", value: 29 },
+ { label: "杩戝崐骞�", value: 180 },
+ { label: "杩戜竴骞�", value: 365 },
+ ],
+ hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
+ addBtnShow: false,
+ dialogTitle: "",
+ OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+ HInterID: null,
+ baseURL: process.env.VUE_APP_BASE_API,
+ lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+ lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
+ selectedRow: null, // 褰撳墠閫変腑鐨勮
+ rowForm: {},
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ HBillNo: "",
+ HInitTimeCycle: 29,
+ HDepartName: "",
+ HWHID: null,
+ HMaterNumber: "",
+ HMaterName: "",
+ ColName1: "",
+ ColName2: "",
+ ColName: "",
+ Comparator1: "",
+ Comparator2: "",
+ Comparator: "",
+ ColContent1: "",
+ ColContent2: "",
+ ColContent: "",
+ },
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 閬僵灞�
+ loading: true,
+ tyResList: [], //閿�鍞嚭搴撳垪琛紙鎺ュ彛鏁版嵁锛�
+ btList: [], //閿�鍞嚭搴撹〃澶村垪琛ㄦ樉绀�
+ btResList: [],
+ tableData: [], //閿�鍞嚭搴撳垪琛�(鍒嗛〉鏄剧ず)
+ dataList: [],
+ titleData: [
+ "hmainid",
+ "hsupid",
+ "HEmpID",
+ "hmanagerid",
+ "hsecmanagerid",
+ "鍙戣揣浜�",
+ "hkeeperid",
+ "淇濈鍛�",
+ "HDeptID",
+ "閿�鍞柟寮�",
+ "hsubid",
+ "hmaterid",
+ "hunitid",
+ "HWHID",
+ ], //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ pageSizes: [50, 100, 500, 5000, 50000],
+ page: 1,
+ pageSize: 0,
+ total: 0,
+ };
+ },
+ created() {
+ // this.fetchData()
+ this.riqiChange();
+ this.getList();
+ },
+
+ methods: {
+ getSummaries(param) {
+ const { columns, data } = param;
+ const sums = [];
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = "鍚堣";
+ return;
+ }
+ const values = data.map((item) => Number(item[column.property]));
+ if (this.totalNameList[index].totalRow) {
+ if (!values.every((value) => isNaN(value))) {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr);
+ if (!isNaN(value)) {
+ return prev + curr;
+ } else {
+ return prev;
+ }
+ }, 0);
+ } else {
+ sums[index] = "";
+ }
+ }
+ }, 1000);
+ return sums;
+ },
+
+ handleBtnHide() {
+ this.btnHideShow = true;
+ this.openBtnHide = true;
+ },
+ handleRowHide() {
+ this.rowHideShow = true;
+ this.openRowHide = true;
+ },
+ rowSetClose(val) {
+ this.rowHideShow = false;
+ this.tableShow = true;
+ this.openRowHide = val;
+ this.getList();
+ },
+ riqiChange() {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
+ const yyyyS = start.getFullYear();
+ const mmS = String(start.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
+ const ddS = String(start.getDate()).padStart(2, "0");
+ const yyyyE = end.getFullYear();
+ const mmE = String(end.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
+ const ddE = String(end.getDate()).padStart(2, "0");
+ this.sTime = yyyyS + "-" + mmS + "-" + ddS;
+ this.eTime = yyyyE + "-" + mmE + "-" + ddE;
+ },
+ getList() {
+ this.sWhere = ''
+ this.pageSize = 50;
+ this.tableShow = false;
+ this.loading = true;
+ if (this.sTime) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
+ }
+ if (this.pageSize == 0) {
+ this.pageSize = 50;
+ }
+ // 鍒楄〃
+ axios
+ .get(this.$baseUrl + "/YF_PayMentOtherBillTran/YF_PayMentOtherBillMainList", {
+ params: {
+ sWhere: this.sWhere,
+ user: sessionStorage["HUserName"],
+ // Organization: sessionStorage["Organization"],
+ // page: this.page,
+ // size: this.pageSize,
+ },
+ })
+ .then((response) => {
+ this.tyResList = response.data.data; //鎬绘暟鎹�
+ let data1 = response.data;
+ let option = [];
+ if (data1.code == 1) {
+ this.btResList = data1.list; //鎺ュ彛琛ㄥご鏁版嵁
+ this.total = data1.count;
+ var data = []; //鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = ["浠舵暟"];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ //寰簭閬嶅巻鏁扮粍
+ data.push({
+ id: data1.list[key].ColmCols,
+ name: data1.list[key].ColmCols,
+ Type: data1.list[key].ColmType,
+ }); //浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: "checkbox", fixed: "left", totalRowText: "鍚堣" });
+ for (var i = 0; i < data.length; i++) {
+ //閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ if (this.titleData.indexOf(data[i].name) > -1) {
+ //妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
+ col.push({
+ field: data[i].id,
+ title: data[i].name,
+ align: "center",
+ hide: true,
+ }); //闅愯棌id鍒�
+ } else if (
+ totalArray.indexOf(data[i].name) > -1 ||
+ data[i].Type == "Decimal" ||
+ data[i].Type == "Int32"
+ ) {
+ //璁＄畻鍒�
+ col.push({
+ field: data[i].id,
+ title: data[i].name,
+ align: "center",
+ sort: true,
+ totalRow: true,
+ width: 120,
+ });
+ } else {
+ col.push({
+ field: data[i].id,
+ title: data[i].name,
+ align: "center",
+ sort: true,
+ width: 200,
+ });
+ }
+ }
+ option.cols = [col];
+ this.dataList = option;
+ option.data = data1.data;
+ var result = data1.data;
+ var temp = "";
+ for (var i = 0; i < result.length; i++) {
+ if (temp != result[i]["hmainid"]) {
+ temp = result[i]["hmainid"];
+ } else {
+ result[i].鏃ユ湡 = null;
+ result[i].鍗曟嵁鍙� = "";
+ /*result[i].鐘舵�� = "";*/
+ result[i].绾㈣摑鍗曟爣璁� = "";
+ result[i].hsupid = "";
+ result[i].瀹㈡埛 = "";
+ result[i].HEmpID = "";
+ result[i].涓氬姟鍛� = "";
+ result[i].hmanagerid = "";
+ result[i].涓荤 = "";
+ result[i].hsecmanagerid = "";
+ result[i].鍙戣揣浜� = "";
+ result[i].hkeeperid = "";
+ result[i].淇濈鍛� = "";
+ result[i].HDeptID = "";
+ result[i].閮ㄩ棬 = "";
+ result[i].閿�鍞柟寮� = "";
+ }
+ }
+ option.data = result;
+ this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ DisPlay_HideColumn(HModName, user, option, dataOption) {
+ this.totalNameList = [];
+ axios
+ .get(this.$baseUrl + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
+ params: {
+ HModName: HModName,
+ user: user,
+ },
+ })
+ .then((res) => {
+ let data1 = res.data;
+ if (data1.data.length != 0) {
+ var dataCol = []; //鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var newCols = [[]]; //瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+ newCols[0].push(option.cols[0][0]); //鏀惧叆绗竴涓猚heckbox
+ dataCol = data1.data[0].HGridString.split(",");
+ //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+ if (dataCol.length == option.cols[0].length - 1) {
+ //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+ for (var j = 0; j < option.cols[0].length - 1; j++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[j].split("|");
+ //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] =
+ "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //鏄剧ず鍒�
+ if (
+ dataCols[1] == 0 &&
+ this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1
+ ) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ } else {
+ option.cols[0][i + 1]["totalRow"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ newCols[0].push(option.cols[0][i + 1]);
+ break;
+ }
+ }
+ }
+ //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ if (dataCol.length == newCols[0].length - 1) {
+ option.cols = newCols;
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i + 1]["fixed"] != null) {
+ option.cols[0][i + 1]["fixed"] = null;
+ } else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if (
+ dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1
+ ) {
+ data1.data[0].HFixCols += 1;
+ }
+
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ //璁剧疆鍒楁帓搴�
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (data1.data[0].HSortFlag == "鏄�") {
+ option.cols[0][i]["sort"] = true;
+ } else {
+ option.cols[0][i]["sort"] = false;
+ }
+ }
+ }
+ }
+ this.btList = option.cols[0];
+ this.btList.map((item) => {
+ if (!item.hide) {
+ this.totalNameList.push(item);
+ }
+ });
+ if (data1.data[0].HPageSize == 0) {
+ this.pageSize = 50;
+ } else {
+ this.pageSize = data1.data[0].HPageSize;
+ }
+ this.tableData = option.data;
+ this.tableShow = true;
+ this.loading = false;
+ } else {
+ this.btList = dataOption.cols[0];
+ this.btList.map((item) => {
+ if (!item.hide) {
+ this.totalNameList.push(item);
+ }
+ });
+ this.tableData = dataOption.data;
+ this.tableShow = true;
+ this.loading = false;
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ renderHeader(h, { column, $index }) {
+ // 鏂板缓涓�涓� span
+ let span = document.createElement(span); // 璁剧疆琛ㄥご鍚嶇О
+ span.innerText = column.label;
+ //涓存椂鎻掑叆 document
+ document.body.appendChild(span); // 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
+ document.body.removeChild(span);
+ return h(span, column.label);
+ },
+ //鐐瑰嚮琛�
+ handleRowClick(row, column, event) {
+ this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆￠�変腑鐨勮
+ this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+ this.lastSelectedRowIndex = this.tableData.indexOf(row);
+ this.$refs.tableData.toggleRowSelection(row);
+ },
+ //閫変腑琛岄珮浜牱寮�
+ rowStyle({ row, rowIndex }) {
+ if (this.ids.includes(row.hmainid)) {
+ return { background: "#ecf5ff" };
+ }
+ },
+ //鍙屽嚮琛�
+ handleDblclick(row, column, cell, event) {
+ this.OperationType = 3;
+ this.handleEdit();
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ // this.rowForm = {}
+ this.ids = selection.map((item) => item.hmainid);
+ this.single = selection.length != 1;
+ this.multiple = !selection.length;
+ if (!this.single) {
+ this.rowForm = selection[0];
+ }
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.sWhere = "";
+ if (this.queryParams.ColName && this.queryParams.Comparator) {
+ var com = "";
+ switch (this.queryParams.Comparator) {
+ case "7":
+ com = "like'%" + this.queryParams.ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + this.queryParams.ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + this.queryParams.ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + this.queryParams.ColContent + "%'";
+ break;
+ default:
+ com =
+ "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName + " " + com;
+ }
+ if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
+ var com1 = "";
+ switch (this.queryParams.Comparator1) {
+ case "7":
+ com1 = "like'%" + this.queryParams.ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + this.queryParams.ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + this.queryParams.ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
+ break;
+ default:
+ com1 =
+ "" +
+ this.queryParams.Comparator1 +
+ "'" +
+ this.queryParams.ColContent1 +
+ "'";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
+ }
+ if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
+ var com2 = "";
+ switch (this.queryParams.Comparator2) {
+ case "7":
+ com2 = "like'%" + this.queryParams.ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + this.queryParams.ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + this.queryParams.ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
+ break;
+ default:
+ com2 =
+ "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
+ }
+ if (this.sTime) {
+ this.sTime = moment(this.sTime).format("YYYY-MM-DD");
+ this.eTime = moment(this.eTime).format("YYYY-MM-DD");
+ console.log(this.sTime, this.eTime);
+ this.sWhere +=
+ " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" +
+ this.sTime +
+ "'" +
+ " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" +
+ this.eTime +
+ "'";
+ }
+ if (this.queryParams.HBillNo) {
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
+ }
+ if (this.queryParams.HDepartName) {
+ this.sWhere += " and 閮ㄩ棬鍚嶇О like '%" + this.queryParams.HDepartName + "%'";
+ }
+ if (this.queryParams.HWHID) {
+ this.sWhere += " and 浠撳簱 like '%" + this.queryParams.HWHID + "%'";
+ }
+ if (this.queryParams.HMaterNumber) {
+ this.sWhere += " and 鐗╂枡浠ｇ爜 like '%" + this.queryParams.HMaterNumber + "%'";
+ }
+ if (this.queryParams.HMaterName) {
+ this.sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.HMaterName + "%'";
+ }
+ this.getList();
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.sWhere = "";
+ this.queryParams = {
+ HBillNo: "",
+ HInitTimeCycle: 29,
+ HProjectNumber: "",
+ HCusID: null,
+ HMaterNumber: "",
+ HMaterName: "",
+ ColName1: "",
+ ColName2: "",
+ ColName: "",
+ Comparator1: "",
+ Comparator2: "",
+ Comparator: "",
+ ColContent1: "",
+ ColContent2: "",
+ ColContent: "",
+ };
+ this.riqiChange();
+ this.resetForm("queryForm");
+ this.getList();
+ },
+
+ //閫�鍑�
+ close() {
+ // this.reset()
+ this.tableShow = true;
+ this.openEdit = false;
+ this.editShow = false;
+ this.getList();
+ },
+ //鎵撳紑鏂板缁勪欢寮圭獥
+ handleAddEdit() {
+ this.rowForm.hmainid = 0;
+ this.editShow = true;
+ this.openEdit = true;
+ },
+ //鎵撳紑淇敼缁勪欢寮圭獥
+ handleEdit(row) {
+ this.rowForm = row;
+ this.editShow = true;
+ this.openEdit = true;
+ },
+ //鍏抽棴缂栬緫椤甸潰
+ editClose(val) {
+ this.open = val;
+ this.editShow = false;
+ this.openEdit = val;
+ this.getList();
+ },
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete() {
+ this.$modal.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠").then(() => {
+ axios.get(this.$baseUrl + "/Kf_StockOutRequestBill/DeltetKf_StockOutRequestBill", {
+ params: {
+ HInterID: this.rowForm.hmainid.toString(),
+ user: sessionStorage["HUserName"],
+ },
+ }).then((response) => {
+ if (response.data.count == 1) {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ } else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message);
+ }
+ }).catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }).catch(() => { });
+ },
+ },
+};
+</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 49f5425..5684ebd 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -54,7 +54,7 @@
<el-form-item label="濮嬪彂鍦�" prop="HBeginAddrName">
<el-input v-model="form.HBeginAddrName" placeholder="璇疯緭鍏ュ鍙戝湴">
<el-button slot="append" icon="el-icon-search"
- @click="openDataDialog('鏆傛棤')"></el-button>
+ @click="openDataDialog(3, areaType = 'b')"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -62,7 +62,7 @@
<el-form-item label="鐩殑鍦�" prop="HEndAddrName">
<el-input v-model="form.HEndAddrName" placeholder="璇疯緭鍏ョ洰鐨勫湴">
<el-button slot="append" icon="el-icon-search"
- @click="openDataDialog('鏆傛棤')"></el-button>
+ @click="openDataDialog(3, areaType = 'e')"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -434,7 +434,9 @@
</el-table-column>
<el-table-column align="center" label="鍣ㄥ叿浠ｇ爜" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.HMouldNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�" />
+ <el-input v-model="scope.row.HMouldNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�"
+ @keyup.native.f7="openDataDialog(8, scope.row)"
+ @dblclick.native="openDataDialog(8, scope.row)" />
</template>
</el-table-column>
<el-table-column align="center" label="鍣ㄥ叿鍚嶇О" width="120">
@@ -476,7 +478,8 @@
<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>
+ controls-position="right"
+ @change="checkTotalQtyExceed(scope.row)"></el-input-number>
</template>
</el-table-column>
<el-table-column align="center" label="浣撶Н" width="120">
@@ -513,11 +516,13 @@
:propsHOrgID="form.HOrgID" v-if="xsSeOutStockBillShow" />
<GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
<GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
- <GyCartype @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCartypeShow" />
+ <GyCartype @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :volume="form.HCarTypeMaxVolume" v-if="gyCartypeShow" />
<GyCar @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCarShow" />
<GyDriver @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyDriverShow" />
<ContractTransport @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName"
v-if="ContractTransportShow" />
+ <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
+ <AreaDialog @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :HBeginAddrName="form.HBeginAddrName" :HEndAddrName="form.HEndAddrName" v-if="AreaDialogShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -545,9 +550,11 @@
import GyCar from "@/views/basic/gyCar/gyCarList.vue"
import GyDriver from "@/views/system/user/GyDriver.vue"
import ContractTransport from "@/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue"
+import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
+import AreaDialog from "@/views/component/AreaDialog"
export default {
name: 'SellOutBill',
- components: { Dept, Warehouse, Material, RowSettings, XsSeOutStockBill, GyCustomer, GySupplier, GyCartype, GyCar, GyDriver, ContractTransport },
+ components: { Dept, Warehouse, Material, RowSettings, XsSeOutStockBill, GyCustomer, GySupplier, GyCartype, GyCar, GyDriver, ContractTransport, GyMould, AreaDialog },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -588,7 +595,10 @@
gyCarShow: false, //杞﹁締鏁版嵁缁勪欢鏄剧ず鏍囪
gyDriverShow: false, //鍙告満鏁版嵁缁勪欢鏄剧ず鏍囪
ContractTransportShow: false, //鎵胯繍鍚堝悓鏁版嵁缁勪欢鏄剧ず鏍囪
+ gyMouldShow: false, //瀹瑰櫒鏁版嵁缁勪欢鏄剧ず鏍囪
+ AreaDialogShow: false, //鐩殑鍦版暟鎹粍浠舵樉绀烘爣璁�
deptform: {}, //寮圭獥閫変腑鏁版嵁
+ areaType: '',//鍦板尯閫夋嫨绫诲瀷
temp: undefined, //涓存椂鍙橀噺
btResList: [], // 鍒楄缃�
@@ -1050,8 +1060,8 @@
this.warehouseShow = true
this.openData = true
} else if (num == 3) {
- this.dialogTitle = '鐗╂枡鍒楄〃'
- this.materialShow = true
+ this.dialogTitle = '鍦板尯鍒楄〃'
+ this.AreaDialogShow = true;
this.openData = true
} else if (num == 4) {
this.dialogTitle = '浠撲綅鍒楄〃'
@@ -1064,6 +1074,10 @@
} else if (num == 7) {
this.dialogTitle = '瀹㈡埛鍒楄〃'
this.gyCustomerShow = true
+ this.openData = true
+ } else if (num == 8) {
+ this.dialogTitle = '瀹瑰櫒鍒楄〃'
+ this.gyMouldShow = true
this.openData = true
} else if (num == 12) {
this.dialogTitle = '婧愬崟鍒楄〃'
@@ -1099,6 +1113,7 @@
this.gyCarShow = false
this.gyDriverShow = false
this.ContractTransportShow = false
+ this.gyMouldShow = false
},
//#endregion
//#endregion
@@ -1119,15 +1134,15 @@
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.榛樿绋庣巼
+ } else if (num == 3) { //鍦板尯
+ if (this.areaType == 'b') {
+ this.form.HBeginAddrName = deptRow.鍦板尯鍚嶇О
+ this.form.HBeginAddr = deptRow.HItemID
+ } else if (this.areaType == 'e') {
+ this.form.HEndAddrName = deptRow.鍦板尯鍚嶇О
+ this.form.HEndAddr = deptRow.HItemID
+ }
+ this.AreaDialogShow = false;
this.openData = false
} else if (num == 6) {
this.form.HCarrierName = deptRow.渚涘簲鍟嗗悕绉�
@@ -1139,6 +1154,16 @@
this.form.HCusID = deptRow.HItemID
this.gyCustomerShow = false
this.openData = false
+ } else if (num == 8) {
+ console.log(deptRow)
+ this.editData[this.zbIndex].HMouldID = deptRow.hmainid
+ this.editData[this.zbIndex].HMouldNumber = deptRow.妯″叿缂栧彿
+ this.editData[this.zbIndex].HMouldName = deptRow.妯″叿鍚嶇О
+ this.editData[this.zbIndex].HMouldLength = deptRow.闀�
+ this.editData[this.zbIndex].HMouldWidth = deptRow.瀹�
+ this.editData[this.zbIndex].HMouldFoldHeight = deptRow.鎶樺彔楂樺害
+ this.gyMouldShow = false
+ this.openData = false
} else if (num == 12) {
// 浣跨敤寮傛鏂瑰紡澶勭悊婧愬崟鏁版嵁
this.processSourceDataAsync(deptRow);
@@ -1146,7 +1171,7 @@
this.form.HCarTypeName = deptRow.杞﹀瀷鍚嶇О
this.form.HCarTypeID = deptRow.HItemID
this.form.HCarTypeMaxVolume = deptRow["鏈�澶т綋绉�(绔嬫柟绫�)"]
- this.calculateLoadingRate(parseFloat($('#HTotalVolume').val()) || 0);
+ this.calculateLoadingRate(parseFloat(this.form.HTotalVolume || 0));
this.gyCartypeShow = false
this.openData = false
} else if (num == 14) {
@@ -1236,10 +1261,10 @@
this.form.HCusName = deptRow[0]["瀹㈡埛"];
}
console.log(deptRow)
- this.form.HMainSourceInterID=deptRow[0]["hmainid"]
- this.form.HMainSourceEntryID=deptRow[0]["hsubid"]
- this.form.HMainSourceBillType=deptRow[0]["HBillType"]
- this.form.HMainSourceBillNo=deptRow[0]["鍗曟嵁鍙�"]
+ this.form.HMainSourceInterID = deptRow[0]["hmainid"]
+ this.form.HMainSourceEntryID = deptRow[0]["hsubid"]
+ this.form.HMainSourceBillType = deptRow[0]["HBillType"]
+ this.form.HMainSourceBillNo = deptRow[0]["鍗曟嵁鍙�"]
// 妫�鏌ユ槸鍚︽墍鏈夎褰曞睘浜庡悓涓�瀹㈡埛
for (var i = 0; i < deptRow.length; i++) {
if (deptRow[i]["HCusID"] != this.form.HCusID) {
@@ -1382,7 +1407,6 @@
var qty = materialInfo.HSNP || 0;
var snp = materialInfo.HSNP || 1;
var mouldQty = snp > 0 ? Math.ceil(qty / snp) : 0;
-
var length = parseFloat(materialInfo.闀垮害) || 0;
var width = parseFloat(materialInfo.瀹藉害) || 0;
var height = parseFloat(materialInfo.楂樺害) || 0;
@@ -1766,7 +1790,7 @@
// 璁＄畻瑁呰浇鐜囧嚱鏁�
calculateLoadingRate(totalVolume) {
- var maxVolume = parseFloat((this.form.HCarTypeMaxVolume).val()) || 0;
+ var maxVolume = parseFloat(this.form.HCarTypeMaxVolume) || 0;
if (maxVolume > 0) {
var loadingRate = (totalVolume / maxVolume * 100).toFixed(2);
this.form.HLoadingRate = loadingRate + "%"
@@ -1775,7 +1799,73 @@
}
},
//#endregion
+ checkTotalQtyExceed(selRow) {
+ var tableData = this.editData
+ console.log(tableData)
+ if (!tableData || tableData.length === 0) return;
+ var sourceQtyMap = {};
+ var currentQtyMap = {};
+ tableData.forEach(function (row) {
+ if (row.HSourceInterID && row.HSourceEntryID) {
+ var key = row.HSourceInterID + '_' + row.HSourceEntryID;
+ if (row.HQty_origin) {
+ sourceQtyMap[key] = parseFloat(row.HQty_origin) || 0;
+ }
+ }
+ });
+ tableData.forEach(function (row) {
+ if (row.HSourceInterID && row.HSourceEntryID) {
+ var key = row.HSourceInterID + '_' + row.HSourceEntryID;
+ var currentQty = parseFloat(row.HQty) || 0;
+
+ if (!currentQtyMap[key]) {
+ currentQtyMap[key] = 0;
+ }
+ currentQtyMap[key] += currentQty;
+ }
+ });
+
+ // 妫�鏌ユ槸鍚﹁秴鍑�
+ var exceedSources = [];
+ for (var key in sourceQtyMap) {
+ var sourceQty = sourceQtyMap[key];
+ var currentTotal = currentQtyMap[key] || 0;
+
+ if (currentTotal > sourceQty) {
+
+ var sourceBillNo = '';
+ tableData.some(function (row) {
+ if (row.HSourceInterID + '_' + row.HSourceEntryID === key) {
+ sourceBillNo = row.HSourceBillNo || '鏈煡婧愬崟';
+ return true;
+ }
+ return false;
+ });
+
+ exceedSources.push({
+ sourceBillNo: sourceBillNo,
+ sourceQty: sourceQty,
+ currentTotal: currentTotal
+ });
+ }
+ }
+ console.log(exceedSources)
+
+ if (exceedSources.length > 0) {
+ var message = '鐗╂枡鏁伴噺涔嬪拰瓒呰繃婧愬崟鏁伴噺锛�';
+ exceedSources.forEach(function (item, index) {
+ message += (index + 1) + '. 婧愬崟鍙凤細' + item.sourceBillNo +
+ '锛屾簮鍗曟暟閲忥細' + item.sourceQty +
+ '锛屽綋鍓嶆暟閲忥細' + item.currentTotal;
+ });
+
+ this.$modal.msgError(message);
+ return true; // 琛ㄧず鏈夎秴鍑�
+ }
+
+ return false; // 琛ㄧず娌℃湁瓒呭嚭
+ },
//#region 闄勪欢涓婁紶鐩稿叧鏂规硶
// 鏂囦欢閫夋嫨鍙樺寲鏃剁殑澶勭悊
handleFileChange(file, fileList) {
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
index 164c49a..d80ed35 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
@@ -551,6 +551,7 @@
HBillNo: '',
HInterID: 0,
HDate: new Date(),
+ HStockOrgID:sessionStorage["OrganizationID"] - 0,
HSupTypeID:1,
HSupName:'',
HSupID:0,
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
index b30be93..b365975 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
@@ -352,7 +352,7 @@
<GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
<GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
<GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
- <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
+ <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :openPageData="openPageData" v-if="gyStockPlaceShow" />
<scMouldIn @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :HOrgID="form.HStockOutOrgID" v-if="scMouldInShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
@@ -407,6 +407,7 @@
addBtnShow: false,
zbIndex: null,
zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
+ openPageData:{},//浼犲叆寮圭獥鐨勬暟鎹�
dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
@@ -1283,9 +1284,14 @@
this.gyMouldShow = true
this.openData = true
} else if (num == 9) {
- this.dialogTitle = '浠撲綅鍒楄〃'
- this.gyStockPlaceShow = true
- this.openData = true
+ if(this.editData[this.zbIndex].HWHName){
+ this.dialogTitle = '浠撲綅鍒楄〃'
+ this.openPageData.HWHName = this.editData[this.zbIndex].HWHName
+ this.gyStockPlaceShow = true
+ this.openData = true
+ }else{
+ this.$modal.msgError("璇峰厛閫夋嫨浠撳簱!");
+ }
} else if (num == 3851) {
this.dialogTitle = '瀹瑰櫒鍏ュ簱鐢宠鍗曞垪琛�'
this.scMouldInShow = true
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
index a88e6fe..76ed53c 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
@@ -391,7 +391,7 @@
<GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
<GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
<GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
- <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
+ <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :openPageData="openPageData" v-if="gyStockPlaceShow" />
<ScMouldMove @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :HOrgID="form.HStockOutOrgID" v-if="scMouldMoveShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
@@ -446,6 +446,7 @@
addBtnShow: false,
zbIndex: null,
zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
+ openPageData:{},//浼犲叆寮圭獥鐨勬暟鎹�
dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
@@ -1363,9 +1364,26 @@
this.gyMouldShow = true
this.openData = true
} else if (num == 9) {
- this.dialogTitle = '浠撲綅鍒楄〃'
- this.gyStockPlaceShow = true
- this.openData = true
+ if(this.HSPType==1){
+ if(this.editData[this.zbIndex].HWHName){
+ this.dialogTitle = '浠撲綅鍒楄〃'
+ this.openPageData.HWHName = this.editData[this.zbIndex].HWHName
+ this.gyStockPlaceShow = true
+ this.openData = true
+ }else{
+ this.$modal.msgError("璇峰厛閫夋嫨璋冨叆浠撳簱!");
+ }
+ }
+ if(this.HSPType==2){
+ if(this.editData[this.zbIndex].HSCWHName){
+ this.dialogTitle = '浠撲綅鍒楄〃'
+ this.openPageData.HWHName = this.editData[this.zbIndex].HSCWHName
+ this.gyStockPlaceShow = true
+ this.openData = true
+ }else{
+ this.$modal.msgError("璇峰厛閫夋嫨璋冨嚭浠撳簱!");
+ }
+ }
} else if (num == 3850) {
this.dialogTitle = '瀹瑰櫒璋冩嫧鐢宠鍗曞垪琛�'
this.scMouldMoveShow = true
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
index 9f11af1..ee9b2f9 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
@@ -352,7 +352,7 @@
<GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
<GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
<GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
- <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
+ <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :openPageData="openPageData" v-if="gyStockPlaceShow" />
<ScMouldOut @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :HOrgID="form.HStockOutOrgID" v-if="scMouldOutShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
@@ -407,6 +407,7 @@
addBtnShow: false,
zbIndex: null,
zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
+ openPageData:{},//浼犲叆寮圭獥鐨勬暟鎹�
dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
@@ -1281,9 +1282,14 @@
this.gyMouldShow = true
this.openData = true
} else if (num == 9) {
- this.dialogTitle = '浠撲綅鍒楄〃'
- this.gyStockPlaceShow = true
- this.openData = true
+ if(this.editData[this.zbIndex].HWHName){
+ this.dialogTitle = '浠撲綅鍒楄〃'
+ this.openPageData.HWHName = this.editData[this.zbIndex].HWHName
+ this.gyStockPlaceShow = true
+ this.openData = true
+ }else{
+ this.$modal.msgError("璇峰厛閫夋嫨浠撳簱!");
+ }
} else if (num == 3849) {
this.dialogTitle = '瀹瑰櫒棰嗙敤鍑哄簱鍗曞垪琛�'
this.scMouldOutShow = true
--
Gitblit v1.9.1