From ff3e3dcb4b1a85bbf530c017fe3add8c0c2d5fa7 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期一, 24 十一月 2025 08:41:44 +0800
Subject: [PATCH] 容器主档编辑
---
src/views/scMould/basicModeling/Gy_MouldFile.vue | 1389 +++++++++++--------
src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue | 236 +++
src/views/basic/gy/gySupplierEdit.vue | 444 +----
src/views/warehouse/barcodeMaster/Gy_BarCodeBill copy.vue | 1088 +++++++++++++++
src/views/ICMO/ScICMOBillList.vue | 675 ++-------
src/views/basic/gyStockPlace/gyStockPlace.vue | 81
src/views/gyMaterial/GyMaterial.vue | 14
src/layout/components/Navbar.vue | 4
src/views/scMould/basicModeling/Gy_MouldFileList.vue | 158 +-
src/views/basic/gyWarehouse/gyWarehouse.vue | 63
10 files changed, 2,539 insertions(+), 1,613 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 88e4751..5d9ab49 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -25,9 +25,9 @@
<i class="el-icon-caret-bottom" />
</div>
<el-dropdown-menu slot="dropdown">
- <router-link to="/user/profile">
+ <!-- <router-link to="/user/profile">
<el-dropdown-item>涓汉涓績</el-dropdown-item>
- </router-link>
+ </router-link> -->
<el-dropdown-item @click.native="setLayout" v-if="setting">
<span>甯冨眬璁剧疆</span>
</el-dropdown-item>
diff --git a/src/views/ICMO/ScICMOBillList.vue b/src/views/ICMO/ScICMOBillList.vue
index 030a0e1..cea20b1 100644
--- a/src/views/ICMO/ScICMOBillList.vue
+++ b/src/views/ICMO/ScICMOBillList.vue
@@ -1,163 +1,99 @@
<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"
- >
+ <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 v-model="eTime" type="date" placeholder="缁撴潫鏃ユ湡" style="width: 150px">
</el-date-picker>
</el-form-item>
<el-form-item label="鏃ユ湡闂撮殧">
- <el-select
- v-model="queryParams.HInitTimeCycle"
- placeholder="璇烽�夋嫨"
- @change="riqiChange"
- >
- <el-option
- v-for="(item, index) in rqsgList"
- :key="index"
- :label="item.label"
- :value="item.value"
- >
+ <el-select v-model="queryParams.HInitTimeCycle" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-option v-for="(item, index) in rqsgList" :key="index" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
- <el-input
- v-model="queryParams.HBillNo"
- placeholder="璇疯緭鍏ュ崟鎹彿"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="缁勭粐">
- <el-select
- v-model="queryParams.HOrgID"
- placeholder="璇烽�夋嫨"
- class="ForFilteringSchemes"
- >
- <el-option
- v-for="(item, index) in organizationList"
- :key="index"
- :label="item.Name"
- :value="item.ID.toString()"
- >
+ <el-select v-model="queryParams.HOrgID" placeholder="璇烽�夋嫨" class="ForFilteringSchemes">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name"
+ :value="item.ID.toString()">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
- <el-input
- v-model="queryParams.HBillNo"
- placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="涓氬姟鐘舵��" prop="HStatus">
<el-select v-model="queryParams.HStatus" placeholder="璇烽�夋嫨涓氬姟鐘舵��">
- <el-option
- :label="item.label"
- :value="item.value"
- :key="index"
- v-for="(item, index) in [
- {
- label: '寮�宸�',
- value: '寮�宸�',
- },
- {
- label: '璁″垝',
- value: '璁″垝',
- },
- {
- label: '璁″垝纭',
- value: '璁″垝纭',
- },
- {
- label: '涓嬭揪',
- value: '涓嬭揪',
- },
- {
- label: '鍏ㄩ儴',
- value: '0',
- },
- {
- label: '瀹屽伐',
- value: '瀹屽伐',
- },
- {
- label: '缁撴',
- value: '缁撴',
- },
- ]"
- ></el-option>
+ <el-option :label="item.label" :value="item.value" :key="index" v-for="(item, index) in [
+ {
+ label: '寮�宸�',
+ value: '寮�宸�',
+ },
+ {
+ label: '璁″垝',
+ value: '璁″垝',
+ },
+ {
+ label: '璁″垝纭',
+ value: '璁″垝纭',
+ },
+ {
+ label: '涓嬭揪',
+ value: '涓嬭揪',
+ },
+ {
+ label: '鍏ㄩ儴',
+ value: '0',
+ },
+ {
+ label: '瀹屽伐',
+ value: '瀹屽伐',
+ },
+ {
+ label: '缁撴',
+ value: '缁撴',
+ },
+ ]"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鏄惁涓嬫帹鐢熸垚娴佽浆鍗�" prop="HSF" label-width="180px">
<el-select v-model="queryParams.HSF">
- <el-option
- :label="item.label"
- :value="item.value"
- :key="item.label"
- v-for="item in [
- {
- label: '鍏ㄩ儴',
- value: '鍏ㄩ儴',
- },
- {
- label: '宸蹭笅鎺�',
- value: '宸蹭笅鎺�',
- },
- {
- label: '鏈笅鎺�',
- value: '鏈笅鎺�',
- },
- ]"
- ></el-option>
+ <el-option :label="item.label" :value="item.value" :key="item.label" v-for="item in [
+ {
+ label: '鍏ㄩ儴',
+ value: '鍏ㄩ儴',
+ },
+ {
+ label: '宸蹭笅鎺�',
+ value: '宸蹭笅鎺�',
+ },
+ {
+ label: '鏈笅鎺�',
+ value: '鏈笅鎺�',
+ },
+ ]"></el-option>
</el-select>
</el-form-item>
<el-form-item label="瑙勬牸鍨嬪彿" prop="HModel">
- <el-input
- v-model="queryParams.HModel"
- placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.HModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="椤圭洰鍙�" prop="HProject">
<el-select v-model="queryParams.HProject">
- <el-option
- :label="item.label"
- :value="item.value"
- :key="item.label"
- v-for="item in HProjectList"
- ></el-option>
+ <el-option :label="item.label" :value="item.value" :key="item.label"
+ v-for="item in HProjectList"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鐢熶骇杞﹂棿" prop="HDeptName">
<el-select v-model="queryParams.HDeptName">
- <el-option
- :label="item.label"
- :value="item.value"
- :key="item.label"
- v-for="item in HDeptNameList"
- ></el-option>
+ <el-option :label="item.label" :value="item.value" :key="item.label"
+ v-for="item in HDeptNameList"></el-option>
</el-select>
</el-form-item>
</el-row>
@@ -165,25 +101,13 @@
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
<el-form-item label="鍗曟嵁绫诲瀷" prop="HBillType">
- <el-input
- v-model="queryParams.HBillType"
- placeholder="璇疯緭鍏ュ崟鎹被鍨�"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.HBillType" placeholder="璇疯緭鍏ュ崟鎹被鍨�" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="鍞竴ID" prop="HErpID">
- <el-input
- v-model="queryParams.HErpID"
- placeholder="璇疯緭鍏ュ敮涓�ID"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.HErpID" placeholder="璇疯緭鍏ュ敮涓�ID" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="鍗曟嵁鍙�" prop="HBillNo2">
- <el-input
- v-model="HBillNo2"
- placeholder="璇疯緭鍏ュ崟鎹彿"
- @keyup.enter.native="syncBill"
- >
+ <el-input v-model="HBillNo2" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="syncBill">
<el-button slot="append" @click="syncBill">閲嶆柊鍚屾</el-button>
</el-input>
</el-form-item>
@@ -193,132 +117,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>
@@ -329,11 +190,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>
@@ -349,64 +207,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(1, (form = rowForm))"
- >瀹℃牳</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_CheckBill(1, (form = rowForm))">瀹℃牳</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="set_CheckBill(2, (form = rowForm))"
- >鍙嶅鏍�</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="set_CheckBill(2, (form = rowForm))">鍙嶅鏍�</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
@@ -431,187 +253,79 @@
>
</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-edit"
- size="mini"
- :disabled="single"
- @click="push_PackingInStockBill((form = rowForm))"
- >涓嬫帹鍖呰棰嗙敤鐢宠鍗�</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+ @click="push_PackingInStockBill((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="handleEdit(row, (OperationType = 3))"
- v-else-if="column.property == '鍗曟嵁鍙�'"
- >{{ row.鍗曟嵁鍙� }}</el-button
- >
+ <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"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes"
+ @pagination="getList" />
+ <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+ <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
<!-- 缂栬緫 -->
- <el-dialog
- title="缂栬緫鐢熶骇璁㈠崟"
- :visible.sync="openEdit"
- width="1480px"
- append-to-body
- class="xsckdBox"
- :before-close="close"
- >
+ <el-dialog title="缂栬緫鐢熶骇璁㈠崟" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
+ :before-close="close">
<!-- <edit
:OperationType="OperationType"
:linterid="this.rowForm.HItemID"
@@ -625,92 +339,39 @@
<iframe :src="iframeUrl" width="100%" height="100%" frameborder="0"></iframe>
</div>
</el-dialog>
- <el-dialog
- :title="upload.title"
- :visible.sync="upload.open"
- width="1500px"
- append-to-body
- >
+ <el-dialog :title="upload.title" :visible.sync="upload.open" width="1500px" append-to-body>
<div style="margin-top: -20px">
<el-button type="primary" @click="set_AddNew">瀵煎叆鏁版嵁</el-button>
<el-button type="primary" @click="upload.open = false">閫� 鍑�</el-button>
- <el-upload
- ref="upload"
- :limit="1"
- accept=".xlsx, .xls"
- style="display: inline-block; margin-left: 10px"
- :action="upload.url + '?updateSupport=' + upload.updateSupport"
- :disabled="upload.isUploading"
- :on-progress="handleFileUploadProgress"
- :on-success="handleFileSuccess"
- >
+ <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" style="display: inline-block; margin-left: 10px"
+ :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+ :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess">
<el-button type="primary">鏂囦欢涓婁紶</el-button>
</el-upload>
</div>
- <el-table
- :data="uploadData"
- v-loading="uploadTableLoading"
- :row-class-name="uploadDataIndex"
- border
- height="550"
- >
+ <el-table :data="uploadData" v-loading="uploadTableLoading" :row-class-name="uploadDataIndex" border
+ height="550">
<el-table-column type="index" label="搴忓彿" width="55" align="center" />
<el-table-column label="缁勭粐浠ｇ爜" prop="缁勭粐浠ｇ爜" align="center" width="120" />
<el-table-column label="缁勭粐鍚嶇О" prop="缁勭粐鍚嶇О" align="center" width="120" />
- <el-table-column
- label="鐢熶骇璧勬簮鍚嶇О"
- prop="鐢熶骇璧勬簮鍚嶇О"
- align="center"
- width="120"
- />
- <el-table-column
- label="鐢熶骇璧勬簮浠ｇ爜"
- prop="鐢熶骇璧勬簮浠ｇ爜"
- align="center"
- width="120"
- />
+ <el-table-column label="鐢熶骇璧勬簮鍚嶇О" prop="鐢熶骇璧勬簮鍚嶇О" align="center" width="120" />
+ <el-table-column label="鐢熶骇璧勬簮浠ｇ爜" prop="鐢熶骇璧勬簮浠ｇ爜" align="center" width="120" />
<el-table-column label="閮ㄩ棬浠ｇ爜" prop="閮ㄩ棬浠ｇ爜" align="center" width="120" />
<el-table-column label="閮ㄩ棬鍚嶇О" prop="閮ㄩ棬鍚嶇О" align="center" width="120" />
- <el-table-column
- label="璐熻矗浜轰唬鐮�"
- prop="璐熻矗浜轰唬鐮�"
- align="center"
- width="120"
- />
+ <el-table-column label="璐熻矗浜轰唬鐮�" prop="璐熻矗浜轰唬鐮�" align="center" width="120" />
<el-table-column label="璐熻矗浜�" prop="璐熻矗浜�" align="center" width="120" />
- <el-table-column
- label="宸ヤ綔涓績浠ｇ爜"
- prop="宸ヤ綔涓績浠ｇ爜"
- align="center"
- width="120"
- />
- <el-table-column
- label="宸ヤ綔涓績鍚嶇О"
- prop="宸ヤ綔涓績鍚嶇О"
- align="center"
- width="120"
- />
+ <el-table-column label="宸ヤ綔涓績浠ｇ爜" prop="宸ヤ綔涓績浠ｇ爜" align="center" width="120" />
+ <el-table-column label="宸ヤ綔涓績鍚嶇О" prop="宸ヤ綔涓績鍚嶇О" align="center" width="120" />
<el-table-column label="鍗曠彮宸ユ椂" prop="鍗曠彮宸ユ椂" align="center" width="120" />
<el-table-column label="鎿嶄綔" align="center">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="uploadDataDelete(scope.row)"
- >鍒犻櫎</el-button
- >
+ <el-button size="mini" type="text" icon="el-icon-delete"
+ @click="uploadDataDelete(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="uploadTotal > 0"
- :total="uploadTotal"
- :page.sync="uploadPage"
- :limit.sync="uploadPageSize"
- :pageSizes="uploadPageSizes"
- @pagination="currentPage"
- />
+ <pagination v-show="uploadTotal > 0" :total="uploadTotal" :page.sync="uploadPage" :limit.sync="uploadPageSize"
+ :pageSizes="uploadPageSizes" @pagination="currentPage" />
</el-dialog>
</div>
</div>
@@ -729,6 +390,7 @@
},
data() {
return {
+ selRowList: [],
iframeUrl: "",
activeSeach: "",
HModName: "Cg_POOrderBillList",
@@ -1329,6 +991,9 @@
this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
+ if (this.openPage == 'Gy_BarCodeBill') {
+ this.$emit('deptEmit', this.selRowList, 10)
+ }
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
@@ -1339,16 +1004,28 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 3;
- this.handleEdit(row, this.OperationType);
+ if (this.openPage == 'Gy_BarCodeBill') {
+ let rowdata=[]
+ rowdata.push(row)
+ console.log(rowdata)
+ this.$emit('deptEmit', rowdata, 10)
+ } else {
+ this.handleEdit(row, this.OperationType);
+ }
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
+ console.log(selection)
// this.rowForm = {}
+ this.selRowList = selection
this.ids = selection.map((item) => item.hmainid);
this.single = selection.length != 1;
this.multiple = !selection.length;
if (!this.single) {
this.rowForm = selection[0];
+ }
+ if (this.openPage == 'Gy_BarCodeBill') {
+ this.$emit('deptEmit', this.selRowList, 10)
}
},
//鎵撳紑渚ц竟鎼滅储寮圭獥
@@ -1582,7 +1259,7 @@
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
}
})
- .catch(() => {});
+ .catch(() => { });
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
@@ -1738,8 +1415,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 }
);
@@ -1768,8 +1445,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 }
);
@@ -1793,7 +1470,7 @@
return deleteList.indexOf(item.index) == -1;
});
})
- .catch(() => {});
+ .catch(() => { });
},
getPage(page, list) {
let sindex = (parseInt(page) - 1) * this.uploadPageSize;
@@ -1816,7 +1493,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/gy/gySupplierEdit.vue b/src/views/basic/gy/gySupplierEdit.vue
index e566424..fc43a34 100644
--- a/src/views/basic/gy/gySupplierEdit.vue
+++ b/src/views/basic/gy/gySupplierEdit.vue
@@ -1,10 +1,10 @@
<template>
<div v-loading="formLoading" v-if="formShow">
<div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
- <el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button>
+ <!-- <el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button>
<el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
<el-button type="primary" @click="set_CheckBill(0, form)">瀹� 鏍�</el-button>
- <el-button type="primary" @click="close">閫� 鍑�</el-button>
+ <el-button 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>
@@ -14,7 +14,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="缂栫爜" prop="HNumber">
- <el-input v-model="form.HNumber" placeholder="璇疯緭鍏ョ紪鐮�" />
+ <el-input v-model="form.HNumber" placeholder="璇疯緭鍏ョ紪鐮�"/>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -242,83 +242,19 @@
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" label="搴忓彿" type="index" width="80" />
- <el-table-column align="center" label="鐗╂枡缂栫爜" width="120">
+ <el-table-column align="center" label="鑱旂郴浜�" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.鐗╂枡浠ｇ爜" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" @keyup.native.f7="openDataDialog(3, scope.row)"
- @dblclick.native="openDataDialog(3, scope.row)" />
+ <el-input v-model="scope.row.HLinkMan" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
</template>
</el-table-column>
- <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
+ <el-table-column align="center" label="鑱旂郴鐢佃瘽" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.鐗╂枡鍚嶇О }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.瑙勬牸鍨嬪彿 }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瀹炲彂鏁伴噺" width="120">
- <template slot-scope="scope">
- <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.HTaxPrice }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="绋庣巼" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HTaxRate }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="閲戦" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HPrice * scope.row.HQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="浠风◣鍚堣" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HTaxPrice * scope.row.HQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍙戣揣浠撳簱" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.鍙戣揣浠撳簱" placeholder="璇疯緭鍏ュ彂璐т粨搴�" @keyup.native.f7="openDataDialog(2, scope.row)"
- @dblclick.native="openDataDialog(2, scope.row)" />
+ <el-input v-model="scope.row.HLinkPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
</template>
</el-table-column>
<el-table-column align="center" label="澶囨敞" width="120">
<template slot-scope="scope">
<el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="閲囪喘鏁伴噺" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HReqBuyQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鐢宠鍑哄簱鏁伴噺" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HReqOutQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="褰撳墠搴撳瓨" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HCurrentInventory }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
@@ -331,92 +267,33 @@
</el-tab-pane>
<el-tab-pane label="浠樻璁″垝" name="second">
<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)"
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb1()" size="mini">澧炲姞涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb1(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-plus" @click="handleCopyZbRow1" 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 :data="editData1" style="width: 100%" height="300" width="100%" ref="zbTable1"
+ @selection-change="handleTableZbEdit1" :row-class-name="rowSysZbIndex1" show-summary border >
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" label="搴忓彿" type="index" width="80" />
- <el-table-column align="center" label="鐗╂枡缂栫爜" width="120">
+ <el-table-column align="center" label="浠樻闃舵" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.鐗╂枡浠ｇ爜" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" @keyup.native.f7="openDataDialog(3, scope.row)"
- @dblclick.native="openDataDialog(3, scope.row)" />
+ <el-input v-model="scope.row.HPayType" placeholder="璇疯緭鍏ヤ粯娆鹃樁娈�" />
</template>
</el-table-column>
- <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
+ <el-table-column align="center" label="浠樻姣斾緥%" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.鐗╂枡鍚嶇О }}</span>
+ <el-input v-model="scope.row.HPayRate" placeholder="璇疯緭鍏ヤ粯娆炬瘮渚�%" />
</template>
</el-table-column>
- <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+ <el-table-column align="center" label="缁撶畻鍛ㄦ湡" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.瑙勬牸鍨嬪彿 }}</span>
+ <el-input v-model="scope.row.HPayTime" placeholder="璇疯緭鍏ョ粨绠楀懆鏈�" />
</template>
</el-table-column>
- <el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
+ <el-table-column align="center" label="澶囨敞璇存槑" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瀹炲彂鏁伴噺" width="120">
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HQty" :min="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.HTaxPrice }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="绋庣巼" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HTaxRate }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="閲戦" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HPrice * scope.row.HQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="浠风◣鍚堣" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HTaxPrice * scope.row.HQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍙戣揣浠撳簱" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.鍙戣揣浠撳簱" placeholder="璇疯緭鍏ュ彂璐т粨搴�" @keyup.native.f7="openDataDialog(2, scope.row)"
- @dblclick.native="openDataDialog(2, scope.row)" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="澶囨敞" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="閲囪喘鏁伴噺" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HReqBuyQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鐢宠鍑哄簱鏁伴噺" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HReqOutQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="褰撳墠搴撳瓨" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HCurrentInventory }}</span>
+ <el-input v-model="scope.row.HPayRemark" placeholder="璇疯緭鍏ュ娉ㄨ鏄�" />
</template>
</el-table-column>
<el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
@@ -456,7 +333,7 @@
import moment from 'moment';
export default {
- name: 'SellOutBillEdit',
+ name: 'GySupplierEdit',
components: { Dept, Warehouse, Material, RowSettings },
props: {
OperationType: { type: Number, },
@@ -476,7 +353,9 @@
hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
addBtnShow: false,
zbIndex: null,
+ zbIndex1: null,
zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
+ zbSelForm1: {},//瀛愯〃閫変腑鏁版嵁
dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
@@ -491,6 +370,7 @@
baseURL: process.env.VUE_APP_BASE_API,
checkedSysZb: [],
editData: [],//閿�鍞嚭搴撳崟瀛愯〃
+ editData1:[],
editBtData: [],//瀛愯〃琛ㄥご
activeName: 'first',
activeNameZB: 'first',
@@ -827,6 +707,7 @@
HStopDate: null,
}
this.editData = []
+ this.editData1 = []
this.editBtData = []
this.ids = []
this.subDisabled = false
@@ -866,6 +747,7 @@
this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
if (this.OperationType == 1) {
this.handleAddSysZb()
+ this.handleAddSysZb1()
}
this.$nextTick(() => {
this.formShow = true
@@ -926,139 +808,53 @@
if (response.data.count == 1) {
var result = response.data
var data = response.data.data[0]
- this.form.BillType = data.HSourceBillType
- if (this.copyType == 1) {
- this.getHBillNo()
- let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
- } else {
- this.form.HBillNo = data.鍗曟嵁鍙�
- this.form.HInterID = data.hmainid
- 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 = {
+ HCREATEORGID:data.HCREATEORGID,
+ HUSEORGID:data.HUSEORGID,
+ HUseOrg:data.浣跨敤缁勭粐,
+ HNumber:data.缂栫爜,
+ HHelpCode:data.鍔╄鐮�,
+ HShortName:data.绠�绉�,
+ HAddress:data.鍦板潃,
+ HLinkMan: data.鑱旂郴浜�,
+ HLinkPhone: data.鑱旂郴鐢佃瘽,
+ HMobilePhone: data.鎵嬫満,
+ HFax: data.浼犵湡,
+ HPostalCode: data.閭紪,
+ HEmail: data.鐢靛瓙閭欢,
+ HCorMan: data.娉曚汉浠ｈ〃,
+ HBank: data.寮�鎴烽摱琛�,
+ HTaxNum: data.绋庡姟鐧昏鍙�,
+ HEnglishName: data.鑻辨枃鍚嶇О,
+ HEnglishAddress: data.鑻辨枃鍦板潃,
+ HCountry: data.鍥藉,
+ HAreaID: data.鍦板尯ID,
+ HAreaName: data.鍦板尯鍚嶇О,
+ HTaxRate: data.澧炲�肩◣鐜�,
+ HCurID: data.榛樿璐у竵ID,
+ HCurName: data.榛樿璐у竵,
+ HSSID: data.缁撶畻鏂瑰紡ID,
+ HSSName: data.缁撶畻鏂瑰紡,
+ HBankAccount: data.閾惰璐﹀彿,
+ HName: data.鍚嶇О,
+ HPSStyleID: data.閲囪喘鏂瑰紡ID,
+ HPSStyleName: data.閲囪喘鏂瑰紡鍚嶇О,
+ HRemark: data.澶囨敞,
+ HUpDater: sessionStorage["HUserName"],
+ HStopflag: data.绂佺敤鏍囧織,
+ HMaterClass: data.渚涜揣鏉愭枡绫诲埆,
+ HSupTypeID: data.HSupTypeID,
+ HSupClsName: data.渚涘簲鍟嗗垎绫�,
+ HMaker: data.鍒跺崟浜�,
+ HMakeDate: data.鍒跺崟鏃ユ湡,
+ HChecker: data.瀹℃牳浜�,
+ HCheckDate: data.瀹℃牳鏃堕棿,
+ HStopMan: data.绂佺敤浜�,
+ HStopDate: data.绂佺敤鏃堕棿,
}
- this.form.HBillSubType = data.HBillSubType
- this.form.HMainSourceInterID = data.HMainSourceInterID
- this.form.HMainSourceEntryID = data.HMainSourceEntryID
- this.form.HMainSourceBillType = data.HMainSourceBillType
- this.form.HMainSourceBillNo = data.HMainSourceBillNo
- this.form.HEmpName = data.涓氬姟鍛�
- this.form.HEmpID = data.HEmpID
- this.form.HDeptName = data.閮ㄩ棬
- this.form.HDeptID = data.HDeptID
- this.form.HManagerName = data.涓荤
- this.form.HManagerID = data.HManagerID
- this.form.HSupName = data.瀹㈡埛
- this.form.HSupID = data.HSupID
- this.form.HLinkMan = data.鑱旂郴浜�
- this.form.HLinkPhone = data.鑱旂郴鐢佃瘽
- this.form.HSecManagerName = data.鍙戣揣浜�
- this.form.HSecManagerID = data.HSecManagerID
- this.form.HKeeperName = data.淇濈鍛�
- this.form.HKeeperID = data.HKeeperID
- this.form.HRemark = data.琛ㄥご澶囨敞
- this.form.HProjectNumber = data.椤圭洰缂栫爜
- this.form.HProjectID = data.HProjectID
- this.form.HProjectName = data.椤圭洰鍚嶇О
- this.form.HGroupName = data.鐝粍
- this.form.HGroupID = data.HGroupID
- this.form.HWHName = data.涓昏〃浠撳簱
- this.form.HWHID = data.HWHID_Main
- this.form.HConveyCompName = data.杩愯緭鍏徃
- this.form.HConveyCompID = data.HConveyCompID
- this.form.HConveyTypeName = data.杩愯緭鏂瑰紡
- this.form.HConveyTypeID = data.HConveyTypeID
- this.form.HConveyMoney = data.HConveyMoney
- this.form.HCarriage = data.杩愯垂
- this.form.HSTOCKORGID = data.HSTOCKORGID
- this.form.HOWNERID = data.HOWNERID
- this.form.HSCWHName = data.涓昏〃璋冨嚭浠撳簱
- this.form.HSCWHID = data.HSCWHID
- this.form.HCheckStatusMan = data.鏍搁攢浜�
- this.form.HExplanation = data.鎽樿
- this.form.HInnerBillNo = data.鍐呴儴鍗曟嵁鍙�
- this.form.HCurName = data.甯佸埆
- this.form.HCurID = data.HCurID
- this.form.HExRate = data.姹囩巼
- this.form.HSellSName = data.閿�鍞柟寮�
- this.form.HSellSID = data.HSellSID
- // this.form.HCusBalance=data
- // this.form.HCreditRating_Now=HConveyMoney
- // this.form.HAvailableBalance=data
- this.form.HPriceType = data.鍗曚环绫诲瀷
- this.form.HOrgID = data.HOrgID
- this.getCustomerByCusID(response.data.data[0].HSupID)//鏍规嵁瀹㈡埛鑾峰彇鑱旂郴浜猴紝鑱旂郴浜虹數璇�
- this.getBarCodeNoteBySellOutBill(rowHmainid)//鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁嗘槸鍚﹀彲缂栬緫
- for (var i = 0; i < result.data.length; i++) {
- this.editData.push(
- {
- "HMaterID": result.data[i].HMaterID
- , "鐗╂枡浠ｇ爜": result.data[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
- , "HUnitID": result.data[i].HUnitID
- , "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅
- , "HQtyMust": result.data[i].搴斿彂鏁伴噺.toFixed(6)
- , "HQty": result.data[i].鏁伴噺.toFixed(6)
- , "HPieceQty": result.data[i].浠舵暟.toFixed(0)
- , "HPrice": result.data[i].鍗曚环.toFixed(4)
- , "HTaxPrice": result.data[i].鍚◣鍗曚环.toFixed(4)
- , "HTaxRate": result.data[i].绋庣巼
- , "HMoney": (result.data[i].鏁伴噺 * result.data[i].鍗曚环).toFixed(2)
- , "HTaxMoney": (result.data[i].鏁伴噺 * result.data[i].鍚◣鍗曚环, 2).toFixed(2)
- , "HWHID": result.data[i].hwhid
- , "鍙戣揣浠撳簱": result.data[i].鍙戣揣浠撳簱
- , "HRemark": result.data[i].琛ㄤ綋澶囨敞
- , "HQty_Full": result.data[i].婊¤溅閲嶉噺
- , "HQty_Empty": result.data[i].绌鸿溅閲嶉噺
- , "HQty_Back": result.data[i].鍥炶溅閲嶉噺
- , "HCostPrice": result.data[i].鎴愭湰鍗曚环
- , "HCostMoney": result.data[i].鎴愭湰閲戦
- , "HSalePrice": result.data[i].閿�鍞崟浠�
- , "HSeOrderInterID": result.data[i].HSeOrderInterID
- , "HSeOrderEntryID": result.data[i].HSeOrderEntryID
- , "HSeOrderBillNo": result.data[i].閿�鍞鍗曞彿
- , "HSourceInterID": result.data[i].HSourceInterID
- , "HSourceEntryID": result.data[i].HSourceEntryID
- , "HSourceBillNo": result.data[i].婧愬崟鍗曞彿
- , "HSourceBillType": result.data[i].HSourceBillType
- , "HRelationQty": result.data[i].鍏宠仈鏁伴噺
- , "HRelationMoney": result.data[i].鍏宠仈閲戦
- , 'HSPID': result.data[i].HSPID
- , 'HSPName': result.data[i].浠撲綅
- , 'HSPGroupID': result.data[i].HSPGroupID
- , "HSPGroupName": result.data[i].浠撲綅缁�
- , 'HSCWHID': result.data[i].HSCWHID
- , 'HSCWHName': result.data[i].璋冨嚭浠撳簱
- , 'HSCSPID': result.data[i].HSCSPID
- , 'HSCSPName': result.data[i].璋冨嚭浠撲綅
- , 'HBatchNo': result.data[i].鎵规
- , 'HPOOrderInterID': result.data[i].閲囪喘璁㈠崟鍐呯爜
- , 'HPOOrderEntryID': result.data[i].閲囪喘璁㈠崟瀛愬唴鐮�
- , 'HPOOrderBillNo': result.data[i].閲囪喘璁㈠崟鍙�
- , 'HPropertyID': result.data[i].HPropertyID
- , 'HPropertyName': result.data[i].杈呭姪灞炴��
- , 'HSecUnitID': result.data[i].HSecUnitID
- , 'HSecUnitName': result.data[i].杈呭姪璁￠噺鍗曚綅
- , 'HSecUnitRate': result.data[i].鎹㈢畻鐜�
- , 'HEngineNum': result.data[i].鍙戝姩鏈哄彿
- , 'HUnderPanNum': result.data[i].鍦扮洏鍙�
- , 'HLeaveFactCard': result.data[i].鍑哄巶璇�
- , 'HReqBuyQty': result.data[i].鐢宠閲囪喘鏁伴噺
- , 'HReqOutQty': result.data[i].鐢宠鍑哄簱鏁伴噺
- , 'HCurrentInventory': result.data[i].褰撳墠搴撳瓨
- }
- );
- }
+ this.editData = result.list[1].Gy_Supplier_Link
+ this.editData1 = result.list[0].Gy_Supplier_PayPlan
+ console.log(856,this.form,this.editData,this.editData1)
if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
this.subDisabled = true
@@ -1090,67 +886,18 @@
rowSysZbIndex({ row, rowIndex }) {
row.index = rowIndex + 1;
},
+ rowSysZbIndex1({ row, rowIndex }) {
+ row.index = rowIndex + 1;
+ },
/** 缂栬緫椤靛瓙琛ㄦ坊鍔犳寜閽搷浣� */
handleAddSysZb(index, num) {
if (num == 1 && !index) {
this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
} else {
let obj = {
- HMaterID: 0,
- 鐗╂枡浠ｇ爜: '',
- 鐗╂枡鍚嶇О: '',
- 瑙勬牸鍨嬪彿: '',
- HUnitID: 0,
- 璁￠噺鍗曚綅: '',
- HQtyMust: 1,
- HQty: 1,
- HPieceQty: 0,
- HPrice: 0,
- HTaxPrice: 0,
- HTaxRate: 0,
- HMoney: 0,
- HTaxMoney: 0,
- HWHID: 0,
- 鍙戣揣浠撳簱: '',
- HRemark: '',
- HQty_Full: 0,
- HQty_Empty: 0,
- HQty_Back: 0,
- HCostPrice: 0,
- HCostMoney: 0,
- HSalePrice: 0,
- HSeOrderInterID: 741,
- HSeOrderEntryID: 18,
- HSeOrderBillNo: 'XSFH00000747',
- HSourceInterID: 741,
- HSourceEntryID: 18,
- HSourceBillNo: 'XSFH00000747',
- HSourceBillType: 1402,
- HRelationQty: 0,
- HRelationMoney: 0,
- HSPID: 0,
- HSPName: '',
- HSPGroupID: 0,
- HSPGroupName: '',
- HSCWHID: 0,
- HSCWHName: '',
- HSCSPID: 0,
- HSCSPName: '',
- HBatchNo: '',
- HPOOrderInterID: 0,
- HPOOrderEntryID: 0,
- HPOOrderBillNo: '',
- HPropertyID: 0,
- HPropertyName: '',
- HSecUnitID: 0,
- HSecUnitName: '',
- HSecUnitRate: 0,
- HEngineNum: '',
- HUnderPanNum: '',
- HLeaveFactCard: '',
- HReqBuyQty: 0,
- HReqOutQty: 0,
- HCurrentInventory: 0,
+ HLinkMan:'',
+ HLinkPhone:'',
+ HRemark:'',
}
if (index) {
this.editData.splice(index, 0, obj);
@@ -1160,12 +907,38 @@
}
}
},
+ handleAddSysZb1(index, num) {
+ if (num == 1 && !index) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
+ } else {
+ let obj = {
+ HPayType:'',
+ HPayRate:'',
+ HPayTime:'',
+ HPayRemark:'',
+ }
+ if (index) {
+ this.editData1.splice(index, 0, obj);
+ this.$set(this.editData1, index, obj)
+ } else {
+ this.editData1.push(obj);
+ }
+ }
+ },
handleCopyZbRow() {
if (!this.zbIndex) {
this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
} else {
let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
this.editData.push(copyRow);
+ }
+ },
+ handleCopyZbRow1() {
+ if (!this.zbIndex1) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ let copyRow = JSON.parse(JSON.stringify(this.zbSelForm1))
+ this.editData1.push(copyRow);
}
},
handleMoveRowUp(zbSelForm) {
@@ -1218,6 +991,15 @@
this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
},
+ handleTableZbEdit1(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.zbTable1.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ },
//鑾峰彇鏈�澶у崟鎹彿_浠诲姟绫伙紙Type涓�0鏃跺彧鑾峰彇涓嶆柊澧炴祦姘村彿锛屼负1鏃舵柊澧炰笖鑾峰彇娴佹按鍙凤級
get_MAXNum_Task(Type) {
var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1205','${this.form.HDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
diff --git a/src/views/basic/gyStockPlace/gyStockPlace.vue b/src/views/basic/gyStockPlace/gyStockPlace.vue
index 92720f7..c9af3c0 100644
--- a/src/views/basic/gyStockPlace/gyStockPlace.vue
+++ b/src/views/basic/gyStockPlace/gyStockPlace.vue
@@ -1,5 +1,5 @@
<template>
- <div style="padding: 10px">
+ <div style="padding: 10px;position: relative">
<el-form
:model="queryParams"
ref="queryForm"
@@ -488,7 +488,6 @@
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
baseURL: process.env.VUE_APP_BASE_API,
- user: "admin",
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
@@ -709,37 +708,6 @@
this.dbEmitData(this.deptform, this.dialogTypeNum);
this.deptform = {};
},
- fetchData() {
- //鐧诲綍鐢ㄦ埛淇℃伅
- axios
- .get(
- "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
- )
- .then((response) => {
- let data = response.data.data[0];
- this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
- this.queryParams.HOrgID = data.HUSEORGID;
-
- this.user = data.Czymc;
- axios
- .get(this.baseURL + "/Web/GetOrganizations", {})
- .then((response) => {
- if (response.data.count == 1) {
- this.organizationList = response.data.data; //缁勭粐鍒楄〃
- this.queryParams.HOrgName = response.data.data.find(
- (e) => e.ID == data.HUSEORGID
- )?.Name;
- }
- this.getList();
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
getList() {
this.tableShow = false;
this.loading = true;
@@ -753,7 +721,7 @@
.get(this.baseURL + "/Gy_StockPlace/list2Page", {
params: {
sWhere: `${this.sWhere}`,
- user: this.user,
+ user: sessionStorage["HUserName"],
page: this.page,
size: this.pageSize,
},
@@ -842,7 +810,12 @@
}
}
option.data = result;
- this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+ this.DisPlay_HideColumn(
+ this.HModName,
+ sessionStorage["HUserName"],
+ option,
+ this.dataList
+ );
}
})
.catch((error) => {
@@ -1000,6 +973,9 @@
this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
+ if (this.openPage) {
+ this.$emit("deptEmit", row, 9);
+ }
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
@@ -1010,16 +986,32 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 3;
- this.handleEdit();
+ if (this.openPage) {
+ this.$emit("deptEmitDb", row, 9);
+ } else {
+ this.handleEdit();
+ }
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
- this.ids = selection.map((item) => item.HItemID);
- this.single = selection.length != 1;
- this.multiple = !selection.length;
- if (!this.single) {
+ if (this.openPage) {
+ //鍒楄〃鍗曢��
+ if (selection.length > 1) {
+ const del_row = selection.shift();
+ this.$refs.tableData.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ this.rowForm = {};
+ this.ids = selection.map((item) => item.HItemID);
this.rowForm = selection[0];
+ } else {
+ //澶氶��
+ this.ids = selection.map((item) => item.HItemID);
+ this.single = selection.length != 1;
+ this.multiple = !selection.length;
+ if (!this.single) {
+ this.rowForm = selection[0];
+ }
}
},
//鎵撳紑渚ц竟鎼滅储寮圭獥
@@ -1133,7 +1125,7 @@
.get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
params: {
HModName: this.HModName,
- user: this.user,
+ user: sessionStorage["HUserName"],
HOrgID: this.zuzhiId,
},
})
@@ -1216,7 +1208,10 @@
if (!this.rowForm.瀹℃牳浜�) {
axios
.get(this.baseURL + "Deltet_Gy_StockPlace", {
- params: { HItemID: this.rowForm.HItemID.toString(), user: this.user },
+ params: {
+ HItemID: this.rowForm.HItemID.toString(),
+ user: sessionStorage["HUserName"],
+ },
})
.then((response) => {
if (response.data.count == 1) {
@@ -1286,7 +1281,7 @@
}
}
var sSubStr = JSON.stringify(num);
- var sMainSub = sSubStr + "&鍜�" + this.user;
+ var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
axios({
method: "post",
url: this.baseURL + "/Gy_Warehouse/Gy_Process_Excel",
diff --git a/src/views/basic/gyWarehouse/gyWarehouse.vue b/src/views/basic/gyWarehouse/gyWarehouse.vue
index c6cf099..9463dd2 100644
--- a/src/views/basic/gyWarehouse/gyWarehouse.vue
+++ b/src/views/basic/gyWarehouse/gyWarehouse.vue
@@ -173,12 +173,8 @@
<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
- >
+ <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>
@@ -191,24 +187,11 @@
<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"
- @close="editBeforeCloseHandle"
- >
- <edit
- :OperationType="OperationType"
- :linterid="this.rowForm.HItemID"
- :HSouceBillType="this.rowForm.HSourceBillType"
- :copyType="copyType"
- @editCloseGy="editGyClose"
- v-if="editShow"
- ref="editRef"
- />
+ <el-dialog title="缂栬緫浠撳簱" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
+ :before-close="close" @close="editBeforeCloseHandle">
+ <edit :OperationType="OperationType" :linterid="this.rowForm.HItemID"
+ :HSouceBillType="this.rowForm.HSourceBillType" :copyType="copyType" @editCloseGy="editGyClose" v-if="editShow"
+ ref="editRef" />
</el-dialog>
<el-dialog :title="upload.title" :visible.sync="upload.open" width="1500px" append-to-body>
<div style="margin-top: -20px">
@@ -849,17 +832,17 @@
},
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
- if (this.checkIsIframe) {
- // IFrame 鍙屽嚮 杩斿洖褰撳墠鍙屽嚮鐨勬暟鎹�
- window.parent.iframeWareHouseCallBack(row);
- return;
- }
this.OperationType = 3;
if (this.openPage) {
this.$emit('deptEmitDb', row, 2)
}
else {
- this.handleEdit();
+ if (this.checkIsIframe) {
+ // IFrame 鍙屽嚮 杩斿洖褰撳墠鍙屽嚮鐨勬暟鎹�
+ window.parent.iframeWareHouseCallBack(row);
+ return;
+ }
+ this.handleEdit();
}
},
// 澶氶�夋閫変腑鏁版嵁
@@ -875,12 +858,12 @@
this.ids = selection.map(item => item.HItemID)
this.rowForm = selection[0]
} else {
- this.ids = selection.map((item) => item.HItemID);
- this.single = selection.length != 1;
- this.multiple = !selection.length;
- if (!this.single) {
- this.rowForm = selection[0];
- }
+ this.ids = selection.map((item) => item.HItemID);
+ this.single = selection.length != 1;
+ this.multiple = !selection.length;
+ if (!this.single) {
+ this.rowForm = selection[0];
+ }
}
},
//鎵撳紑渚ц竟鎼滅储寮圭獥
@@ -1167,8 +1150,8 @@
} else {
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- response.Message +
- "</div>",
+ response.Message +
+ "</div>",
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
@@ -1197,8 +1180,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 }
);
diff --git a/src/views/gyMaterial/GyMaterial.vue b/src/views/gyMaterial/GyMaterial.vue
index b1246a2..ae7d9d9 100644
--- a/src/views/gyMaterial/GyMaterial.vue
+++ b/src/views/gyMaterial/GyMaterial.vue
@@ -1,5 +1,5 @@
<template>
- <div style="padding: 10px">
+ <div style="padding: 10px; position: relative;">
<el-card style="margin-bottom: 10px;">
<el-form :inline="true" :model="queryParams" ref="queryForm" class="mb8">
<el-form-item label="鐗╂枡浠ｇ爜" prop="HNumber">
@@ -1204,6 +1204,9 @@
this.$refs.tableData.toggleRowSelection(row);
this.selectedRow = row;
this.getFileList(row.鐗╂枡浠ｇ爜);
+ if (this.openPage) {
+ this.$emit('deptEmit', row, 3)
+ }
},
@@ -1262,18 +1265,23 @@
// 琛屾牱寮�
rowStyle({ row, rowIndex }) {
- if (this.ids.includes(row.hmainid)) {
+ if (this.ids.includes(row.HItemID)) {
return { background: "#ecf5ff" };
}
},
// 鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
+ if (this.openPage) {
+ this.$emit('deptEmitDb', row, 3)
+ } else {
this.handleMaterialCodeClick(row);
+ }
},
handleSelectionChange(selection) {
- this.ids = selection.map((item) => item.hmainid);
+ console.log(selection)
+ this.ids = selection.map((item) => item.HItemID);
this.single = selection.length != 1;
this.multiple = !selection.length;
if (!this.single) {
diff --git a/src/views/scMould/basicModeling/Gy_MouldFile.vue b/src/views/scMould/basicModeling/Gy_MouldFile.vue
index 624d3e0..55a336c 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFile.vue
+++ b/src/views/scMould/basicModeling/Gy_MouldFile.vue
@@ -1,184 +1,291 @@
<template>
<div v-loading="formLoading" v-if="formShow">
<div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
- <el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button>
<el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
- <el-button type="primary" @click="set_CheckBill(0, form)">瀹� 鏍�</el-button>
<el-button type="primary" @click="close">閫� 鍑�</el-button>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
<div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鍣ㄥ叿妗ｆ缂栬緫</div>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="140px">
<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="璇疯緭鍏ュ崟鎹紪鍙�" />
+ <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+ <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
</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 v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="婧愬崟绫诲瀷" prop="BillType">
- <el-select v-model="form.BillType" placeholder="璇烽�夋嫨">
- <el-option label="閿�鍞鍗�" value="1401" />
- <el-option label="鍙戣揣閫氱煡鍗�" value="1402" />
+ <el-form-item label="璐т富绫诲瀷" prop="HMouldOWNER">
+ <el-select v-model="form.HMouldOWNER" placeholder="璇烽�夋嫨">
+ <el-option label="鑷垂" value="鑷垂" />
+ <el-option label="瀹緵" value="瀹緵" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="婧愬崟鍙�" prop="HMainSourceBillNo">
- <el-input v-model="form.HMainSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞彿" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
+ <el-form-item label="鍣ㄥ叿缂栧彿" prop="HMouldNo">
+ <el-input v-model="form.HMouldNo" placeholder="璇疯緭鍏ュ櫒鍏风紪鍙�" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<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)"></el-button>
+ <el-form-item label="鍣ㄥ叿鍚嶇О" prop="HName">
+ <el-input v-model="form.HName" placeholder="璇疯緭鍏ュ櫒鍏峰悕绉�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍣ㄥ叿瑙勬牸" prop="HModel">
+ <el-input v-model="form.HModel" placeholder="璇疯緭鍏ュ櫒鍏疯鏍�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍣ㄥ叿鍨嬪彿" prop="HModel2">
+ <el-input v-model="form.HModel2" placeholder="璇疯緭鍏ュ櫒鍏峰瀷鍙�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鐩村緞" prop="HDiameter">
+ <el-input v-model="form.HDiameter" placeholder="璇疯緭鍏ョ洿寰�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="杈呭姪灞炴��" prop="HSubjoin">
+ <el-input v-model="form.HSubjoin" placeholder="璇疯緭鍏ヨ緟鍔╁睘鎬�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="杈呭姪灞炴��2" prop="HSubjoin2">
+ <el-input v-model="form.HSubjoin2" placeholder="璇疯緭鍏ヨ緟鍔╁睘鎬�2" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍥惧彿" prop="HPICNo">
+ <el-input v-model="form.HPICNo" placeholder="璇疯緭鍏ュ浘鍙�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鐢熶骇浜у搧鍨嬪彿" prop="HWorkMaterModel">
+ <el-input v-model="form.HWorkMaterModel" placeholder="璇疯緭鍏ョ敓浜т骇鍝佸瀷鍙�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="瀵瑰簲ERP鐗╂枡" prop="HMaterNumber">
+ <el-input v-model="form.HMaterNumber" placeholder="璇疯緭鍏ュ搴擡RP鐗╂枡" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(3)"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="閿�鍞儴闂�" prop="HDeptName">
- <el-input v-model="form.HDeptName" placeholder="璇疯緭鍏ラ攢鍞儴闂�" disabled>
+ <el-form-item label="鍣ㄥ叿鍒嗙被" prop="HMouleTypeName">
+ <el-input v-model="form.HMouleTypeName" placeholder="璇疯緭鍏ュ櫒鍏峰垎绫�" disabled>
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍗曚綅" prop="HUnitName">
+ <el-input v-model="form.HUnitName" placeholder="璇疯緭鍏ュ崟浣�" disabled>
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍑哄巶鏃ユ湡" prop="HOutComDate">
+ <el-date-picker v-model="form.HOutComDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍑哄巶缂栧彿" prop="HOutComNo">
+ <el-input v-model="form.HOutComNo" placeholder="璇疯緭鍏ュ嚭鍘傜紪鍙�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="浣跨敤閮ㄩ棬" prop="HDeptName">
+ <el-input v-model="form.HDeptName" placeholder="璇疯緭鍏ヤ娇鐢ㄩ儴闂�" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="涓荤" prop="HManagerName">
- <el-input v-model="form.HManagerName" placeholder="璇疯緭鍏ヤ富绠�" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
+ <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="6">
- <el-form-item label="瀹㈡埛" prop="HSupName">
- <el-input v-model="form.HSupName" placeholder="璇疯緭鍏ュ鎴�" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
+ <el-form-item label="鍣ㄥ叿鐘舵��" prop="HMouldStatus">
+ <el-select v-model="form.HMouldStatus" placeholder="璇烽�夋嫨">
+ <el-option label="鍦ㄥ簱" value="鍦ㄥ簱" />
+ <el-option label="涓婃満" value="涓婃満" />
+ <el-option label="鍑哄簱" value="鍑哄簱" />
+ <el-option label="鍦ㄩ��" value="鍦ㄩ��" />
+ <el-option label="涓㈠け" value="涓㈠け" />
+ <el-option label="閿佸畾" value="閿佸畾" />
+ <el-option label="棰嗗嚭" value="棰嗗嚭" />
+ <el-option label="鎶ュ簾" value="鎶ュ簾" />
+ <el-option label="鏈惎鐢�" value="鏈惎鐢�" />
+ <el-option label="浣滃簾" value="浣滃簾" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="瀹夊叏瀵垮懡" prop="HSaveLife">
+ <el-input v-model="form.HSaveLife" placeholder="璇疯緭鍏ュ畨鍏ㄥ鍛�" />
+ </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 = 1)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鐗堟湰鍙�" prop="HVersion">
+ <el-input v-model="form.HVersion" placeholder="璇疯緭鍏ョ増鏈彿" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="榛樿浠撲綅" prop="HSPName">
+ <el-input v-model="form.HSPName" placeholder="璇疯緭鍏ラ粯璁や粨浣�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(9, cwType = 1)"></el-button>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="鑱旂郴浜�" prop="HLinkMan">
- <el-input v-model="form.HLinkMan" placeholder="璇疯緭鍏ヨ仈绯讳汉" disabled />
+ <el-form-item label="璁捐瀵垮懡" prop="HDesignLife">
+ <el-input v-model="form.HDesignLife" placeholder="璇疯緭鍏ヨ璁″鍛�" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鑱旂郴鐢佃瘽" prop="HLinkPhone">
- <el-input v-model="form.HLinkPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" disabled />
+ <el-form-item label="浣跨敤瀵垮懡" prop="HUseLife">
+ <el-input v-model="form.HUseLife" placeholder="璇疯緭鍏ヤ娇鐢ㄥ鍛�" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="棰嗘枡浜�" prop="HSecManagerName">
- <el-input v-model="form.HSecManagerName" placeholder="璇疯緭鍏ラ鏂欎汉">
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
+ <el-form-item label="鍓╀綑瀵垮懡" prop="HLeaveLife">
+ <el-input v-model="form.HLeaveLife" placeholder="璇疯緭鍏ュ墿浣欏鍛�" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="浠撶" prop="HKeeperName">
- <el-input v-model="form.HKeeperName" placeholder="璇疯緭鍏ヤ粨绠�">
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
+ <el-form-item label="宸茬敓浜ф暟閲�" prop="HProdQty">
+ <el-input v-model="form.HProdQty" placeholder="璇疯緭鍏ュ凡鐢熶骇鏁伴噺" disabled />
</el-form-item>
</el-col>
</el-row>
- <el-form-item label="澶囨敞" prop="HRemark">
- <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
- </el-form-item>
<el-row>
<el-col :span="6">
- <el-form-item label="椤圭洰浠ｇ爜" prop="HProjectNumber">
- <el-input v-model="form.HProjectNumber" placeholder="璇疯緭鍏ラ」鐩唬鐮�" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
-
- </el-input>
+ <el-form-item label="宸茬敓浜ч噸閲�" prop="HProdWeight">
+ <el-input v-model="form.HProdWeight" placeholder="璇疯緭鍏ュ凡鐢熶骇閲嶉噺" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="椤圭洰鍚嶇О" prop="HProjectName">
- <el-input v-model="form.HProjectName" placeholder="璇疯緭鍏ラ」鐩悕绉�" disabled />
+ <el-form-item label="绌存暟" prop="HCaveQty">
+ <el-input v-model="form.HCaveQty" placeholder="璇疯緭鍏ョ┐鏁�" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鐝粍" prop="HGroupName">
- <el-input v-model="form.HGroupName" placeholder="璇疯緭鍏ョ彮缁�" disabled>
+ <el-form-item label="榛樿淇濆吇瑙勭▼" prop="HMouldMaintainRuleInterName">
+ <el-input v-model="form.HMouldMaintainRuleInterName" placeholder="璇疯緭鍏ラ粯璁や繚鍏昏绋�" disabled>
<el-button slot="append" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍑哄簱浠撳簱" prop="HWHName">
- <el-input v-model="form.HWHName" placeholder="璇疯緭鍏ュ嚭搴撲粨搴�">
- <el-button slot="append" icon="el-icon-search"></el-button>
- </el-input>
+ <el-form-item label="鏉＄爜缂栧彿" prop="HBarCode">
+ <el-input v-model="form.HBarCode" placeholder="璇疯緭鍏ユ潯鐮佺紪鍙�" disabled />
</el-form-item>
</el-col>
</el-row>
- </el-tab-pane>
- <el-tab-pane label="鍏朵粬淇℃伅" name="second">
<el-row>
<el-col :span="6">
- <el-form-item label="缁勭粐" prop="HOrgID">
- <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" @change="organizationChange" :disabled="zzSelDis">
+ <el-form-item label="鍒堕�犲巶鍟�" prop="HMadeSupName">
+ <el-input v-model="form.HMadeSupName" placeholder="璇疯緭鍏ュ埗閫犲巶鍟�" disabled>
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="涓嬫淇濆吇/鏍℃鏃ユ湡" prop="HNextMainDate">
+ <el-date-picker v-model="form.HNextMainDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍣ㄥ叿绫诲瀷" prop="HMouldClass">
+ <el-select v-model="form.HMouldClass" placeholder="璇烽�夋嫨">
+ <el-option label="妯″叿" value="妯″叿" />
+ <el-option label="宸ヨ" value="宸ヨ" />
+ <el-option label="澶瑰叿" value="澶瑰叿" />
+ <el-option label="鍒�鍏�" value="鍒�鍏�" />
+ <el-option label="妫�鍏�" value="妫�鍏�" />
+ <el-option label="鍛ㄨ浆鍣ㄥ叿" value="鍛ㄨ浆鍣ㄥ叿" />
+ <el-option label="鍏朵粬" value="鍏朵粬" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="涓婄嚎鍒濆鍖栧鍛�" prop="HInitLife">
+ <el-input v-model="form.HInitLife" placeholder="璇疯緭鍏ヤ笂绾垮垵濮嬪寲瀵垮懡" disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="褰撳墠浠撳簱" prop="HNowWHName">
+ <el-input v-model="form.HNowWHName" placeholder="璇疯緭鍏ュ綋鍓嶄粨搴�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2, ckType = 2)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="褰撳墠浠撲綅" prop="HNowSPName">
+ <el-input v-model="form.HNowSPName" placeholder="璇疯緭鍏ュ綋鍓嶄粨搴�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(9, cwType = 2)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍣ㄥ叿鍙敤鐘舵��" prop="HMouldUseStatus">
+ <el-select v-model="form.HMouldUseStatus" placeholder="璇烽�夋嫨">
+ <el-option label="姝ｅ父" value="姝ｅ父" />
+ <el-option label="寮傚父" value="寮傚父" />
+ <el-option label="淇濆吇" value="淇濆吇" />
+ <el-option label="缁翠慨" value="缁翠慨" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="浣跨敤缁勭粐" prop="HCREATEORGID">
+ <el-select v-model="form.HCREATEORGID" placeholder="璇烽�夋嫨缁勭粐浣跨敤" @change="organizationChange"
+ :disabled="zzSelDis">
<el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="甯佸埆" prop="HCurName">
- <el-input v-model="form.HCurName" placeholder="璇疯緭鍏ュ竵鍒�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="姹囩巼" prop="HExRate">
- <el-input v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="閿�鍞柟寮�" prop="HSellSName">
- <el-input v-model="form.HSellSName" placeholder="璇疯緭鍏ラ攢鍞柟寮�" disabled />
- </el-form-item>
- </el-col>
</el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="鍗曚环绫诲瀷" prop="HPriceType">
- <el-select v-model="form.HPriceType" placeholder="璇烽�夋嫨鍗曚环绫诲瀷" @change="organizationChange">
- <el-option v-for="(item, index) in hPriceTypeList" :key="index" :label="item" :value="item">
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="瀹㈡埛浣欓" prop="HCusBalance">
- <el-input v-model="form.HCusBalance" placeholder="璇疯緭鍏ュ鎴蜂綑棰�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="淇＄敤棰濆害" prop="HCreditRating_Now">
- <el-input v-model="form.HCreditRating_Now" placeholder="璇疯緭鍏ヤ俊鐢ㄩ搴�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍙敤棰濆害" prop="HAvailableBalance">
- <el-input v-model="form.HAvailableBalance" placeholder="璇疯緭鍏ュ彲鐢ㄩ搴�" disabled />
- </el-form-item>
- </el-col>
- </el-row>
+
</el-tab-pane>
<el-tab-pane label="鍒跺崟淇℃伅" name="third">
<el-row>
@@ -246,113 +353,123 @@
</el-row>
</el-tab-pane>
</el-tabs>
- <div style="margin-bottom: 10px;">
- <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()" size="mini">澧炲姞涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
- size="mini">鎻掑叆涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow" size="mini">澶嶅埗涓�琛�</el-button>
- <el-button type="success" plain icon="el-icon-arrow-up" @click="handleMoveRowUp(zbSelForm)"
- size="mini">涓婄Щ</el-button>
- <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
- size="mini">涓嬬Щ</el-button>
- </div>
- <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
- @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column align="center" label="搴忓彿" type="index" width="80" />
- <el-table-column align="center" label="鐗╂枡缂栫爜" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.鐗╂枡浠ｇ爜" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" @keyup.native.f7="openDataDialog(3, scope.row)"
- @dblclick.native="openDataDialog(3, scope.row)" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.鐗╂枡鍚嶇О }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.瑙勬牸鍨嬪彿 }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瀹炲彂鏁伴噺" width="120">
- <template slot-scope="scope">
- <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.HTaxPrice }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="绋庣巼" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HTaxRate }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="閲戦" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HPrice * scope.row.HQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="浠风◣鍚堣" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HTaxPrice * scope.row.HQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍙戣揣浠撳簱" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.鍙戣揣浠撳簱" placeholder="璇疯緭鍏ュ彂璐т粨搴�" @keyup.native.f7="openDataDialog(2, scope.row)"
- @dblclick.native="openDataDialog(2, scope.row)" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="澶囨敞" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="閲囪喘鏁伴噺" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HReqBuyQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鐢宠鍑哄簱鏁伴噺" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HReqOutQty }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="褰撳墠搴撳瓨" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HCurrentInventory }}</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-tabs type="border-card">
+ <el-tab-pane label="瀛愬櫒鍏�">
+ <div style="margin-bottom: 10px;">
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(type = 'edit')"
+ size="mini">澧炲姞涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow(type = 'edit')"
+ 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="瀛愬櫒鍏�">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HMouldFileName" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="缁勮鏃ユ湡">
+ <template slot-scope="scope">
+ <el-date-picker v-model="scope.row.HUnionDate" type="date" placeholder="閫夋嫨缁勮鏃ユ湡">
+ </el-date-picker>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="澶囨敞">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎿嶄綔">
+ <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-tab-pane>
+ <el-tab-pane label="淇濆吇瑙勭▼">
+ <div style="margin-bottom: 10px;">
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(type = 'maintain')"
+ size="mini">澧炲姞涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow(type = 'maintain')"
+ size="mini">澶嶅埗涓�琛�</el-button>
+ </div>
+ <el-table :data="maintainData" style="width: 100%" height="300" width="100%" ref="zbByTable"
+ @selection-change="handleTableZbByEdit" :row-class-name="rowSysZbByIndex" 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="淇濆吇瑙勭▼鍗曟嵁鍙�">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.淇濆吇瑙勭▼鍗曟嵁鍙�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="澶囨敞">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="榛樿鏍囪">
+ <template slot-scope="scope">
+ <el-checkbox v-model="scope.row.HStdFlag"></el-checkbox>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎿嶄綔">
+ <template slot-scope="scope">
+ <el-button type="danger" icon="el-icon-delete" size="mini" circle
+ @click="handleDeleteSysZbBy(scope.row)"></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
+ <el-tab-pane label="鐐规瑙勭▼">
+ <div style="margin-bottom: 10px;">
+ <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(type = 'dotCheck')"
+ size="mini">澧炲姞涓�琛�</el-button>
+ <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow(type = 'dotCheck')"
+ size="mini">澶嶅埗涓�琛�</el-button>
+ </div>
+ <el-table :data="dotCheckData" style="width: 100%" height="300" width="100%" ref="zbDjTable"
+ @selection-change="handleTableZbDjEdit" :row-class-name="rowSysZbDjIndex" 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="鐐规瑙勭▼鍗曟嵁鍙�">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.鐐规瑙勭▼鍗曟嵁鍙�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="澶囨敞">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="榛樿鏍囪">
+ <template slot-scope="scope">
+ <el-checkbox v-model="scope.row.HStdFlag"></el-checkbox>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎿嶄綔">
+ <template slot-scope="scope">
+ <el-button type="danger" icon="el-icon-delete" size="mini" circle
+ @click="handleDeleteSysZbDj(scope.row)"></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
+ </el-tabs>
+
</el-form>
<!-- 閮ㄩ棬寮圭獥 -->
<el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
- <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
- <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
- <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
+ <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" />
+ <GySource @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySourceShow" />
+ <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
+ <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
+ <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>
@@ -366,16 +483,20 @@
<script>
import axios from 'axios'
-import Dept from '@/views/component/dept'
-import Warehouse from '@/views/component/warehouse'
-import Material from '@/views/component/material'
+import Dept from '@/views/basic/gy/gyDepartment.vue'
+import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
+import Material from '@/views/gyMaterial/GyMaterial.vue'
import RowSettings from '@/views/component/rowSettings'
import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import GySource from '@/views/basic/production/gySource.vue'
+import GySupplier from '@/views/basic/gy/gySupplier.vue'
+import GyCustomer from '@/views/GyCustomer'
+import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
import moment from 'moment';
export default {
- name: 'SellOutBillEdit',
- components: { Dept, Warehouse, Material, RowSettings, GyEmployee },
+ name: 'Gy_MouldFile',
+ components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GySource, GySupplier, GyCustomer, GyStockPlace },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -385,7 +506,9 @@
},
data() {
return {
- HModName: "Kf_SellOutBill",
+ HModName: "Gy_MouldFile",
+ ckType: null,
+ cwType: null,
formShow: false,
temp: undefined,
formLoading: true,
@@ -396,21 +519,33 @@
addBtnShow: false,
zbIndex: null,
zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
+ zbByIndex: null,
+ zbBySelForm: {},//瀛愯〃閫変腑鏁版嵁
+ zbDjIndex: null,
+ zbDjSelForm: {},//瀛愯〃閫変腑鏁版嵁
dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
materialShow: false,//鐗╂枡鏁版嵁缁勪欢
gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
+ gySourceShow: false,
+ gySupplierShow: false,
+ gyCustomerShow: false,
+ gyStockPlaceShow: false,
deptform: {},//寮圭獥閫変腑鏁版嵁
openData: false,//鏁版嵁寮圭獥
dialogTitle: '',
- organizationList: [],//缁勭粐鍒楄〃
+ organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
baseURL: process.env.VUE_APP_BASE_API,
checkedSysZb: [],
- editData: [],//閿�鍞嚭搴撳崟瀛愯〃
+ checkedSysZbBy: [],
+ checkedSysZbDj: [],
+ editData: [],//瀛愯〃
+ maintainData: [],
+ dotCheckData: [],
editBtData: [],//瀛愯〃琛ㄥご
activeName: 'first',
// 寮瑰嚭灞傛爣棰�
@@ -452,33 +587,22 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
- HSupName: [
- { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
- ],
- HDate: [
- { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
- ],
- HExRate: [
- { required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }
- ]
+ // HSupName: [
+ // { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
+ // ],
+ // 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() {
console.log(this.copyType, this.OperationType)
this.formShow = false
@@ -646,29 +770,54 @@
if (num == 1) {
this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
this.form.HDeptID = deptRow.HItemID
- this.form.HManagerName = deptRow.璐熻矗浜�
this.deptShow = false
this.openData = false
} else if (num == 2) {
- this.editData[this.zbIndex].HWHID = deptRow.HItemID;
- this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
+ if (this.ckType == 1) {
+ this.form.HWHName = deptRow.浠撳簱鍚嶇О;
+ this.form.HWHID = deptRow.HItemID;
+ } else if (this.ckType == 2) {
+ this.form.HNowWHName = deptRow.浠撳簱鍚嶇О;
+ this.form.HNowWHID = deptRow.HItemID;
+ }
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.form.HName = deptRow.鐗╂枡鍚嶇О;
+ this.form.HMaterNumber = deptRow.鐗╂枡浠ｇ爜;
+ this.form.HMaterID = deptRow.HItemID;
this.materialShow = false
this.openData = false
} else if (num == 4) {
this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
this.form.HEmpID = deptRow.HItemID
this.gyEmployeeShow = false
+ this.openData = false
+ } else if (num == 5) {
+ this.form.HSourceName = deptRow.鐢熶骇璧勬簮鍚嶇О
+ this.form.HSourceID = deptRow.HItemID
+ this.gySourceShow = 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 == 7) {
+ console.log(deptRow)
+ this.form.HCusName = deptRow.瀹㈡埛鍚嶇О
+ this.form.HCusID = deptRow.HItemID
+ this.gyCustomerShow = false
+ this.openData = false
+ } else if (num == 9) {
+ if (this.cwType == 1) {
+ this.form.HSPName = deptRow.浠撲綅鍚嶇О;
+ this.form.HSPID = deptRow.HMainID;
+ } else if (this.cwType == 2) {
+ this.form.HNowSPName = deptRow.浠撲綅鍚嶇О;
+ this.form.HNowSPID = deptRow.HMainID;
+ }
+ this.gyStockPlaceShow = false
this.openData = false
}
} else {
@@ -689,87 +838,9 @@
this.openData = false
},
- //閿�鍞嚭搴撳崟鏂板缂栬緫琛ㄥ崟鍒濆鍖�
- reset() {
- this.form = {
- BillType: '1402',
- HBillNo: '',
- HInterID: '',
- HBillSubType: '1205',
- HDate: new Date(),
- HMainSourceInterID: 0,
- HMainSourceEntryID: 0,
- HMainSourceBillType: '',
- HMainSourceBillNo: '',
- HEmpName: '',
- HEmpID: 0,
- HDeptName: '',
- HDeptID: 0,
- HManagerName: '',
- HManagerID: 0,
- HSupName: sessionStorage["HSupName"],
- HSupID: sessionStorage["HSupID"],
- HLinkMan: '',
- HLinkPhone: '',
- HSecManagerName: '',
- HSecManagerID: 0,
- HKeeperName: '',
- HKeeperID: 0,
- HRemark: '',
- HProjectNumber: '',
- HProjectID: 0,
- HProjectName: '',
- HGroupName: '',
- HGroupID: 0,
- HWHName: '',
- HWHID: 0,
- HConveyCompName: '',
- HConveyCompID: 0,
- HConveyTypeName: '',
- HConveyTypeID: 0,
- HConveyMoney: '0',
- HCarriage: '0',
- HSTOCKORGID: sessionStorage["OrganizationID"] - 0,//缁勭粐id
- HOWNERID: sessionStorage["OrganizationID"] - 0,
- HSCWHName: '',
- HSCWHID: 0,
- HCheckStatusMan: '',
- HExplanation: '',
- HInnerBillNo: '',
- HCurName: '浜烘皯甯�',
- HCurID: 1,
- HExRate: '1',
- HSellSName: '',
- HSellSID: 0,
- HCusBalance: '0',
- HCreditRating_Now: '0',
- HAvailableBalance: '0',
- HPriceType: '鎴愭湰浠�',
- HOrgID: sessionStorage["OrganizationID"] - 0,
- HMaker: '',
- HUpDater: '',
- HChecker: '',
- HMakeDate: new Date(),
- HUpDateDate: '',
- HCheckDate: '',
- HCloseMan: '',
- HDeleteMan: '',
- HCloseDate: '',
- 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()
- console.log(1111)
console.log(this.$route.path)
if (!this.OperationType && !this.copyType) {
console.log(this.$route.path)
@@ -807,13 +878,92 @@
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
+
+ //鏂板缂栬緫琛ㄥ崟鍒濆鍖�
+ reset() {
+ this.form = {
+ HInterID: 0,
+ HBillNo: '',
+ HDate: moment(new Date()).format('YYYY-MM-DDTHH:mm:ss'),
+ HMouldOWNER: '',
+ HMouldNo: '',
+ HName: '',
+ HModel: '',
+ HModel2: '',
+ HDiameter: '',
+ HSubjoin: '',
+ HSubjoin2: '',
+ HPICNo: '',
+ HWorkMaterModel: '',
+ HMaterID: 0,
+ HMaterNumber: '',
+ HMouleTypeID: 0,
+ HMouleTypeName: '',
+ HUnitID: 0,
+ HUnitName: '',
+ HOutComDate: moment(new Date()).format('YYYY-MM-DDTHH:mm:ss'),
+ HOutComNo: '',
+ HDeptID: 0,
+ HDeptName: '',
+ HSupID: 0,
+ HSupName: '',
+ HMouldStatus: '',
+ HSaveLife: 0,
+ HWHID: 0,
+ HWHName: '',
+ HVersion: '',
+ HSPID: 0,
+ HSPName: '',
+ HDesignLife: 0,
+ HUseLife: 0,
+ HLeaveLife: 0,
+ HInitLife: 0,
+ HCaveQty: 0,
+ HProdQty: 0,
+ HProdWeight: 0,
+ HMouldDotCheckRuleInterName: '',
+ HMouldDotCheckRuleInterID: 0,
+ HMouldMaintainRuleInterName: '',
+ HMouldMaintainRuleInterID: 0,
+ HBarCode: '',
+ HMadeSupID: 0,
+ HMadeSupName: '',
+ HMouldClass: '',
+ HNowWHID: 0,
+ HNowWHName: '',
+ HNowSPID: 0,
+ HNowSPName: '',
+ HMouldUseStatus: '',
+ HNextMainDate: '',
+ HUSEORGID: sessionStorage["OrganizationID"],
+ HCREATEORGID: sessionStorage["OrganizationID"],
+ HMaker: sessionStorage["HUserName"],
+ HMakeDate: '',
+ HChecker: '',
+ HCheckDate: '',
+ HUpDater: '',
+ HUpDateDate: '',
+ HCloseMan: '',
+ HCloseDate: '',
+ HDeleteMan: '',
+ HDeleteDate: '',
+ }
+ this.editData = []
+ this.editBtData = []
+ this.maintainData = []
+ this.dotCheckData = []
+ this.ids = []
+ this.subDisabled = false
+ this.addBtnShow = false
+ // this.$refs.tableData.clearSelection()
+ this.activeName = 'first'
+ this.resetForm("form");
+ },
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.reset()
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
- let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
if (this.OperationType == 1) {
this.handleAddSysZb()
}
@@ -823,21 +973,17 @@
})
},
getHBillNo() {
- axios.get(this.baseURL + "/WEBSController/GetMaxBillNoAndID_Json", {
+ axios.get(this.baseURL + "/Web/GetMAXNum", {
params: {
- HBillType: '1205'
+ HBillType: '3899'
}
}).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("鎺ュ彛璇锋眰澶辫触!");
});
},
- //鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁�
+ //鑾峰彇瀵瑰簲鐨勬潯鐮佹槑缁�
getBarCodeNoteBySellOutBill(rowHmainid) {
axios.get(this.baseURL + '/Kf_SellOutBill/BarCodeNote', {
params: { "HInterID": rowHmainid }
@@ -869,8 +1015,7 @@
handleUpdate() {
this.reset()
let rowHmainid = this.linterid
- console.log(this.linterid)
- axios.get(this.baseURL + "/Kf_SellOutBill/cx", {
+ axios.get(this.baseURL + "/Gy_Mould_Edit/xg", {
params: { 'HInterID': rowHmainid }
}).then(response => {
if (response.data.count == 1) {
@@ -879,8 +1024,6 @@
this.form.BillType = data.HSourceBillType
if (this.copyType == 1) {
this.getHBillNo()
- let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
} else {
this.form.HBillNo = data.鍗曟嵁鍙�
this.form.HInterID = data.hmainid
@@ -896,130 +1039,153 @@
this.form.HCloseDate = data.鍏抽棴鏃ユ湡
this.form.HDeleteDate = data.浣滃簾鏃ユ湡
}
- this.form.HBillSubType = data.HBillSubType
- this.form.HMainSourceInterID = data.HMainSourceInterID
- this.form.HMainSourceEntryID = data.HMainSourceEntryID
- this.form.HMainSourceBillType = data.HMainSourceBillType
- this.form.HMainSourceBillNo = data.HMainSourceBillNo
- this.form.HEmpName = data.涓氬姟鍛�
- this.form.HEmpID = data.HEmpID
- this.form.HDeptName = data.閮ㄩ棬
+ this.form.HMouldOWNER = data.璐т富绫诲瀷
+ this.form.HMouldNo = data.妯″叿缂栧彿
+ this.form.HName = data.妯″叿鍚嶇О
+ this.form.HModel = data.褰撳墠妯″叿瑙勬牸
+ this.form.HModel2 = data.妯″叿鍨嬪彿
+ this.form.HDiameter = data.鐩村緞
+ this.form.HSubjoin = data.杈呭姪灞炴��
+ this.form.HSubjoin2 = data.杈呭姪灞炴��2
+ this.form.HPICNo = data.鍥惧彿
+ this.form.HWorkMaterModel = data.鐢熶骇浜у搧鍨嬪彿
+ this.form.HMaterID = data.HMaterID
+ this.form.HMaterNumber = data.瀵瑰簲ERP鐗╂枡缂栫爜
+ this.form.HMouleTypeID = data.HMouldTypeID
+ this.form.HMouleTypeName = data.妯″叿鍝佺被
+ this.form.HUnitID = data.HUnitID
+ this.form.HUnitName = data.璁￠噺鍗曚綅
+ this.form.HOutComDate = data.鍑哄巶鏃ユ湡
+ this.form.HOutComNo = data.鍑哄巶缂栧彿
this.form.HDeptID = data.HDeptID
- this.form.HManagerName = data.涓荤
- this.form.HManagerID = data.HManagerID
- this.form.HSupName = data.瀹㈡埛
+ this.form.HDeptName = data.浣跨敤閮ㄩ棬
this.form.HSupID = data.HSupID
- this.form.HLinkMan = data.鑱旂郴浜�
- this.form.HLinkPhone = data.鑱旂郴鐢佃瘽
- this.form.HSecManagerName = data.鍙戣揣浜�
- this.form.HSecManagerID = data.HSecManagerID
- this.form.HKeeperName = data.淇濈鍛�
- this.form.HKeeperID = data.HKeeperID
- this.form.HRemark = data.琛ㄥご澶囨敞
- this.form.HProjectNumber = data.椤圭洰缂栫爜
- this.form.HProjectID = data.HProjectID
- this.form.HProjectName = data.椤圭洰鍚嶇О
- this.form.HGroupName = data.鐝粍
- this.form.HGroupID = data.HGroupID
- this.form.HWHName = data.涓昏〃浠撳簱
- this.form.HWHID = data.HWHID_Main
- this.form.HConveyCompName = data.杩愯緭鍏徃
- this.form.HConveyCompID = data.HConveyCompID
- this.form.HConveyTypeName = data.杩愯緭鏂瑰紡
- this.form.HConveyTypeID = data.HConveyTypeID
- this.form.HConveyMoney = data.HConveyMoney
- this.form.HCarriage = data.杩愯垂
- this.form.HSTOCKORGID = data.HSTOCKORGID
- this.form.HOWNERID = data.HOWNERID
- this.form.HSCWHName = data.涓昏〃璋冨嚭浠撳簱
- this.form.HSCWHID = data.HSCWHID
- this.form.HCheckStatusMan = data.鏍搁攢浜�
- this.form.HExplanation = data.鎽樿
- this.form.HInnerBillNo = data.鍐呴儴鍗曟嵁鍙�
- this.form.HCurName = data.甯佸埆
- this.form.HCurID = data.HCurID
- this.form.HExRate = data.姹囩巼
- this.form.HSellSName = data.閿�鍞柟寮�
- this.form.HSellSID = data.HSellSID
- // this.form.HCusBalance=data
- // this.form.HCreditRating_Now=HConveyMoney
- // this.form.HAvailableBalance=data
- this.form.HPriceType = data.鍗曚环绫诲瀷
- this.form.HOrgID = data.HOrgID
- this.getCustomerByCusID(response.data.data[0].HSupID)//鏍规嵁瀹㈡埛鑾峰彇鑱旂郴浜猴紝鑱旂郴浜虹數璇�
- this.getBarCodeNoteBySellOutBill(rowHmainid)//鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁嗘槸鍚﹀彲缂栬緫
+ this.form.HSupName = data.渚涘簲鍟�
+ this.form.HMouldStatus = data.妯″叿鐘舵��
+ this.form.HSaveLife = data.瀹夊叏瀵垮懡
+ this.form.HWHID = data.HWhID
+ this.form.HWHName = data.榛樿浠撳簱
+ this.form.HVersion = data.鐗堟湰
+ this.form.HSPID = data.HSPID
+ this.form.HSPName = data.榛樿浠撲綅
+ this.form.HDesignLife = data.鍒濆璁捐瀵垮懡
+ this.form.HUseLife = data.浣跨敤瀵垮懡
+ this.form.HLeaveLife = data.鍓╀綑瀵垮懡
+ this.form.HInitLife = data.涓婄嚎鍒濆鍖栧鍛� == null ? 0 : data.涓婄嚎鍒濆鍖栧鍛�
+ this.form.HCaveQty = data.绌存暟
+ this.form.HProdQty = data.宸茬敓浜ф暟閲�
+ this.form.HProdWeight = data.宸茬敓浜ч噸閲�
+ this.form.HMouldDotCheckRuleInterName = data.鐐规瑙勭▼鍗曞彿
+ this.form.HMouldDotCheckRuleInterID = data.HMouldDotCheckRuleInterID
+ this.form.HMouldMaintainRuleInterName = data.淇濆吇瑙勭▼鍗曞彿
+ this.form.HMouldMaintainRuleInterID = data.HMouldMaintainRuleInterID
+ this.form.HBarCode = data.鏉＄爜缂栧彿
+ this.form.HMadeSupID = data.HMadeSupID
+ this.form.HMadeSupName = data.鍒堕�犲巶鍟�
+ this.form.HMouldClass = data.鍣ㄥ叿鍒嗙被
+ this.form.HNowWHID = data.褰撳墠浠撳簱ID
+ this.form.HNowWHName = data.褰撳墠浠撳簱
+ this.form.HNowSPID = data.褰撳墠浠撲綅ID
+ this.form.HNowSPName = data.褰撳墠浠撲綅
+ this.form.HMouldUseStatus = data.妯″叿鍙敤鐘舵��
+ this.form.HNextMainDate = data.鏍℃鏃ユ湡
+ this.form.HUSEORGID = data.HUSEORGID
for (var i = 0; i < result.data.length; i++) {
this.editData.push(
{
- "HMaterID": result.data[i].HMaterID
- , "鐗╂枡浠ｇ爜": result.data[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
- , "HUnitID": result.data[i].HUnitID
- , "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅
- , "HQtyMust": result.data[i].搴斿彂鏁伴噺.toFixed(6)
- , "HQty": result.data[i].鏁伴噺.toFixed(6)
- , "HPieceQty": result.data[i].浠舵暟.toFixed(0)
- , "HPrice": result.data[i].鍗曚环.toFixed(4)
- , "HTaxPrice": result.data[i].鍚◣鍗曚环.toFixed(4)
- , "HTaxRate": result.data[i].绋庣巼
- , "HMoney": (result.data[i].鏁伴噺 * result.data[i].鍗曚环).toFixed(2)
- , "HTaxMoney": (result.data[i].鏁伴噺 * result.data[i].鍚◣鍗曚环, 2).toFixed(2)
- , "HWHID": result.data[i].hwhid
- , "鍙戣揣浠撳簱": result.data[i].鍙戣揣浠撳簱
- , "HRemark": result.data[i].琛ㄤ綋澶囨敞
- , "HQty_Full": result.data[i].婊¤溅閲嶉噺
- , "HQty_Empty": result.data[i].绌鸿溅閲嶉噺
- , "HQty_Back": result.data[i].鍥炶溅閲嶉噺
- , "HCostPrice": result.data[i].鎴愭湰鍗曚环
- , "HCostMoney": result.data[i].鎴愭湰閲戦
- , "HSalePrice": result.data[i].閿�鍞崟浠�
- , "HSeOrderInterID": result.data[i].HSeOrderInterID
- , "HSeOrderEntryID": result.data[i].HSeOrderEntryID
- , "HSeOrderBillNo": result.data[i].閿�鍞鍗曞彿
- , "HSourceInterID": result.data[i].HSourceInterID
- , "HSourceEntryID": result.data[i].HSourceEntryID
- , "HSourceBillNo": result.data[i].婧愬崟鍗曞彿
- , "HSourceBillType": result.data[i].HSourceBillType
- , "HRelationQty": result.data[i].鍏宠仈鏁伴噺
- , "HRelationMoney": result.data[i].鍏宠仈閲戦
- , 'HSPID': result.data[i].HSPID
- , 'HSPName': result.data[i].浠撲綅
- , 'HSPGroupID': result.data[i].HSPGroupID
- , "HSPGroupName": result.data[i].浠撲綅缁�
- , 'HSCWHID': result.data[i].HSCWHID
- , 'HSCWHName': result.data[i].璋冨嚭浠撳簱
- , 'HSCSPID': result.data[i].HSCSPID
- , 'HSCSPName': result.data[i].璋冨嚭浠撲綅
- , 'HBatchNo': result.data[i].鎵规
- , 'HPOOrderInterID': result.data[i].閲囪喘璁㈠崟鍐呯爜
- , 'HPOOrderEntryID': result.data[i].閲囪喘璁㈠崟瀛愬唴鐮�
- , 'HPOOrderBillNo': result.data[i].閲囪喘璁㈠崟鍙�
- , 'HPropertyID': result.data[i].HPropertyID
- , 'HPropertyName': result.data[i].杈呭姪灞炴��
- , 'HSecUnitID': result.data[i].HSecUnitID
- , 'HSecUnitName': result.data[i].杈呭姪璁￠噺鍗曚綅
- , 'HSecUnitRate': result.data[i].鎹㈢畻鐜�
- , 'HEngineNum': result.data[i].鍙戝姩鏈哄彿
- , 'HUnderPanNum': result.data[i].鍦扮洏鍙�
- , 'HLeaveFactCard': result.data[i].鍑哄巶璇�
- , 'HReqBuyQty': result.data[i].鐢宠閲囪喘鏁伴噺
- , 'HReqOutQty': result.data[i].鐢宠鍑哄簱鏁伴噺
- , 'HCurrentInventory': result.data[i].褰撳墠搴撳瓨
+ "HMouldFileID": result.data[i]["HMouldFileID"],
+ "HMouldFileName": result.data[i]["瀛愬櫒鍏�"],
+ "HUnionDate": result.data[i]["缁勮鏃ユ湡"],
+ "HRemark": result.data[i]["琛ㄤ綋澶囨敞"]
}
);
}
- if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
- this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
- this.subDisabled = true
+ var HCycleUnit = data.鍛ㄦ湡鍗曚綅;
+ var HCheckCycle = data.淇濆吇鍛ㄦ湡;
+ if (!(HCycleUnit == null || HCheckCycle == null)) {
+ this.calculateHNextMainDate(data.hmainid, HCycleUnit, HCheckCycle);
}
this.formShow = true
this.formLoading = false
-
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
+ axios.get(this.baseURL + "/Gy_MouldFileMain/Gy_MouldFileSubDetai", {
+ params: { 'HInterID': rowHmainid }
+ }).then(response => {
+ if (response.data.code == 1) {
+ let data = response.data
+ var dataMaintainRule = data.data[0];
+ var dataDotCheckRule = data.data[1];
+ console.log(dataMaintainRule)
+ //瀛愯〃1璧嬪��
+ for (var i = 0; i < dataMaintainRule.length; i++) {
+ this.maintainData.push(
+ {
+ "HMaintainRuleID": dataMaintainRule[i].HMaintainRuleID,
+ "淇濆吇瑙勭▼鍗曟嵁鍙�": dataMaintainRule[i].HBillNo,
+ "HStdFlag": dataMaintainRule[i].HStdFlag,
+ "HRemark": dataMaintainRule[i].HRemark,
+ "HSourceInterID": dataMaintainRule[i].HSourceInterID,
+ "HSourceEntryID": dataMaintainRule[i].HSourceEntryID,
+ "HSourceBillNo": dataMaintainRule[i].HSourceBillNo,
+ "HSourceBillType": dataMaintainRule[i].HSourceBillType
+ }
+ )
+ }
+ for (var i = 0; i < dataDotCheckRule.length; i++) {
+ this.dotCheckData.push(
+ {
+ "HDotCheckRuleID": dataDotCheckRule[i].HDotCheckRuleID,
+ "鐐规瑙勭▼鍗曟嵁鍙�": dataDotCheckRule[i].HBillNo,
+ "HStdFlag": dataDotCheckRule[i].HStdFlag,
+ "HRemark": dataDotCheckRule[i].HRemark,
+ "HSourceInterID": dataDotCheckRule[i].HSourceInterID,
+ "HSourceEntryID": dataDotCheckRule[i].HSourceEntryID,
+ "HSourceBillNo": dataDotCheckRule[i].HSourceBillNo,
+ "HSourceBillType": dataDotCheckRule[i].HSourceBillType
+ }
+ )
+ }
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#region 璁＄畻-涓嬫淇濆吇/鏍℃鏃ユ湡
+ calculateHNextMainDate(HInterID, HCycleUnit, HCheckCycle) {
+ axios.get(this.baseURL + "/Gy_Mould_Edit/calculateHNextMainDate", {
+ params: { 'HInterID': HInterID }
+ }).then(response => {
+ let d = response.data
+ var HDate = this.form.HDate
+ var HEndDate = d.data[0].淇濆吇璁板綍缁撴潫鏃ユ湡 == null ? moment(HDate).format('YYYY-MM-DD') : moment(d.data[0].淇濆吇璁板綍缁撴潫鏃ユ湡).format('YYYY-MM-DD');
+ if (HCycleUnit == "澶�") {
+ var time = HCheckCycle * 1000 * 60 * 60 * 24;
+ time += Date.parse(new Date(HEndDate));
+ var HNextMainDate = moment(time).format('YYYY-MM-DD')
+ this.form.HNextMainDate = HNextMainDate
+ } else if (HCycleUnit == "鍛�") {
+ var time = HCheckCycle * 7 * 1000 * 60 * 60 * 24;
+ time += Date.parse(new Date(HEndDate));
+ var HNextMainDate = moment(time).format('YYYY-MM-DD')
+ this.form.HNextMainDate = HNextMainDate
+ } else if (HCycleUnit == "鏈�") {
+ var year = HEndDate.split("-")[0] * 1;
+ var month = HEndDate.split("-")[1] * 1;
+ var day = HEndDate.split("-")[2] * 1;
+ if ((month + HCheckCycle) % 12 == 0) {
+ year += parseInt(((month + HCheckCycle) / 12 - 1));
+ month = 12;
+ } else {
+ year += parseInt((month + HCheckCycle) / 12);
+ month = (month + HCheckCycle) % 12;
+ }
+ var HNextMainDate = year + "-" + month + "-" + day;
+ this.form.HNextMainDate = HNextMainDate
+ }
+ })
},
//鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
getCustomerByCusID(HCusID) {
@@ -1036,120 +1202,86 @@
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,
- 璁￠噺鍗曚綅: '',
- HQtyMust: 1,
- HQty: 1,
- HPieceQty: 0,
- HPrice: 0,
- HTaxPrice: 0,
- HTaxRate: 0,
- HMoney: 0,
- HTaxMoney: 0,
- HWHID: 0,
- 鍙戣揣浠撳簱: '',
- HRemark: '',
- HQty_Full: 0,
- HQty_Empty: 0,
- HQty_Back: 0,
- HCostPrice: 0,
- HCostMoney: 0,
- HSalePrice: 0,
- HSeOrderInterID: 741,
- HSeOrderEntryID: 18,
- HSeOrderBillNo: 'XSFH00000747',
- HSourceInterID: 741,
- HSourceEntryID: 18,
- HSourceBillNo: 'XSFH00000747',
- HSourceBillType: 1402,
- HRelationQty: 0,
- HRelationMoney: 0,
- HSPID: 0,
- HSPName: '',
- HSPGroupID: 0,
- HSPGroupName: '',
- HSCWHID: 0,
- HSCWHName: '',
- HSCSPID: 0,
- HSCSPName: '',
- HBatchNo: '',
- HPOOrderInterID: 0,
- HPOOrderEntryID: 0,
- HPOOrderBillNo: '',
- HPropertyID: 0,
- HPropertyName: '',
- HSecUnitID: 0,
- HSecUnitName: '',
- HSecUnitRate: 0,
- HEngineNum: '',
- HUnderPanNum: '',
- HLeaveFactCard: '',
- HReqBuyQty: 0,
- HReqOutQty: 0,
- HCurrentInventory: 0,
- }
- if (index) {
- this.editData.splice(index, 0, obj);
- this.$set(this.editData, index, obj)
+ handleAddSysZb(type) {
+ let obj1 = {
+ "HMouldFileID": "0",
+ "HMouldFileName": "",
+ "HUnionDate": moment(new Date()).format('YYYY-MM-DD'),
+ "HRemark": "",
+ "HSourceInterID": "0",
+ "HSourceEntryID": "0",
+ "HSourceBillNo": "",
+ "HSourceBillType": ""
+ }
+ let obj2 = {
+ "HMaintainRuleID": "0",
+ "淇濆吇瑙勭▼鍗曟嵁鍙�": '',
+ "HStdFlag": false,
+ "HRemark": '',
+ "HSourceInterID": "0",
+ "HSourceEntryID": "0",
+ "HSourceBillNo": "",
+ "HSourceBillType": ""
+ }
+ let obj3 = {
+ "HDotCheckRuleID": "0",
+ "鐐规瑙勭▼鍗曟嵁鍙�": '',
+ "HStdFlag": false,
+ "HRemark": '',
+ "HSourceInterID": "0",
+ "HSourceEntryID": "0",
+ "HSourceBillNo": "",
+ "HSourceBillType": ""
+ }
+ if (type == 'edit') {
+ this.editData.push(obj1)
+ } else if (type == 'maintain') {
+ this.maintainData.push(obj2)
+ } else if (type == 'dotCheck') {
+ this.dotCheckData.push(obj3)
+ } else if (!type) {
+ this.editData.push(obj1)
+ this.maintainData.push(obj2)
+ this.dotCheckData.push(obj3)
+ }
+ },
+ handleCopyZbRow(type) {
+ let indexNum = null
+ if (type == 'edit') {
+ indexNum = this.zbIndex
+ if (!indexNum) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
} else {
- this.editData.push(obj);
+ let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
+ this.editData.push(copyRow)
+ }
+ } else if (type == 'maintain') {
+ indexNum = this.zbByIndex
+ if (!indexNum) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ let copyRow = JSON.parse(JSON.stringify(this.zbBySelForm))
+ this.maintainData.push(copyRow)
+ }
+ } else if (type == 'dotCheck') {
+ indexNum = this.zbDjIndex
+ if (!indexNum) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ let copyRow = JSON.parse(JSON.stringify(this.zbDjSelForm))
+ this.dotCheckData.push(copyRow)
}
}
- },
- 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("璇峰厛閫夋嫨瑕佸垹闄ょ殑鍟嗗搧璁㈠崟鏄庣粏鏁版嵁");
+ this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ゆ暟鎹�");
} else {
const editData = this.editData;
const checkedSysZb = this.checkedSysZb;
@@ -1167,6 +1299,66 @@
const del_row = selection.shift()
this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
+ },
+ /** 瀛愯〃鏄庣粏搴忓彿 */
+ rowSysZbIndex({ row, rowIndex }) {
+ row.index = rowIndex + 1;
+ },
+ /** 缂栬緫椤靛瓙琛ㄥ垹闄ゆ寜閽搷浣� */
+ handleDeleteSysZbBy(row) {
+ this.checkedSysZbBy = []
+ this.checkedSysZbBy.push(row.index)
+ if (this.checkedSysZbBy.length == 0) {
+ this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ゆ暟鎹�");
+ } else {
+ const editData = this.maintainData;
+ const checkedSysZb = this.checkedSysZbBy;
+ this.maintainData = editData.filter(function (item) {
+ return checkedSysZb.indexOf(item.index) == -1
+ });
+ }
+ },
+ /** 缂栬緫椤靛瓙琛ㄥ閫夋閫変腑鏁版嵁 */
+ handleTableZbByEdit(selection) {
+ this.checkedSysZbBy = selection.map(item => item.index)
+ this.zbBySelForm = selection[0]
+ this.zbByIndex = this.checkedSysZbBy[0]
+ if (selection.length > 1) {
+ const del_row = selection.shift()
+ this.$refs.zbByTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ },
+ /** 淇濆吇瀛愯〃鏄庣粏搴忓彿 */
+ rowSysZbByIndex({ row, rowIndex }) {
+ row.index = rowIndex + 1;
+ },
+ /** 缂栬緫椤靛瓙琛ㄥ垹闄ゆ寜閽搷浣� */
+ handleDeleteSysZbDJ(row) {
+ this.checkedSysZbDJ = []
+ this.checkedSysZbDJ.push(row.index)
+ if (this.checkedSysZbDJ.length == 0) {
+ this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ゆ暟鎹�");
+ } else {
+ const editData = this.dotCheckData;
+ const checkedSysZb = this.checkedSysZbDJ;
+ this.dotCheckData = editData.filter(function (item) {
+ return checkedSysZb.indexOf(item.index) == -1
+ });
+ }
+ },
+ /** 缂栬緫椤靛瓙琛ㄥ閫夋閫変腑鏁版嵁 */
+ handleTableZbDjEdit(selection) {
+ this.checkedSysZbDy = selection.map(item => item.index)
+ this.zbDjSelForm = selection[0]
+ this.zbDjIndex = this.checkedSysZbDy[0]
+ if (selection.length > 1) {
+ const del_row = selection.shift()
+ this.$refs.zbDjTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ },
+ /** 鐐规瀛愯〃鏄庣粏搴忓彿 */
+ rowSysZbDjIndex({ row, rowIndex }) {
+ row.index = rowIndex + 1;
},
//鑾峰彇鏈�澶у崟鎹彿_浠诲姟绫伙紙Type涓�0鏃跺彧鑾峰彇涓嶆柊澧炴祦姘村彿锛屼负1鏃舵柊澧炰笖鑾峰彇娴佹按鍙凤級
get_MAXNum_Task(Type) {
@@ -1187,61 +1379,48 @@
},
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
+ console.log(1)
this.$refs["form"].validate(valid => {
if (valid) {
- let fhck = false
- this.editData.map((item, index) => {
- if (!item.鍙戣揣浠撳簱) {
- fhck = true
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
+ let url = null
+ var user = sessionStorage["HUserName"]
+ var ModRightNameAdd = 'Gy_MouldFile_Edit'
+ if (!this.form.HNextMainDate) {
+ this.form.HNextMainDate = moment(new Date()).format('YYYY-MM-DD');
+ }
+ if (this.OperationType == 3) {
+ this.form.HUpDater = sessionStorage["HUserName"]
+ url = '/Gy_Mould_Edit/AddBill1'
+ } else (
+ url = '/Gy_Mould_Edit/AddBill'
+ )
+ var sMainStr = JSON.stringify(this.form);
+ var sSubStr = JSON.stringify(this.editData);
+ var mainTableMaintainRuleStr = JSON.stringify(this.maintainData);
+ var mainTableDotCheckRuleStr = JSON.stringify(this.dotCheckData);
+ var oMain = sMainStr + ";" + ModRightNameAdd + ";" + user + ";" + sSubStr + ";" + mainTableMaintainRuleStr + ";" + mainTableDotCheckRuleStr;
+ axios({
+ method: 'post',
+ url: this.baseURL + url,
+ data: {
+ 'oMain': oMain
+ },
+ }).then(response => {
+ console.log(response)
+
+ if (response.data.count == 1) {
+ // this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+ this.$modal.msgSuccess(response.data.Message);
+ // this.addBtnShow = true
+ this.formShow = false
+ this.$emit('editClose', false)
}
- })
- this.$nextTick(() => {
- if (!fhck) {
- var sMainStr = JSON.stringify(this.form);
- var sSubStr = JSON.stringify(this.editData);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
- axios({
- method: 'post',
- url: this.baseURL + "/Kf_SellOutBill/SaveSellOutBillList",
- data: {
- 'msg': sMainSub
- },
- }).then(response => {
- if (response.data.count == 1) {
- this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
- this.$modal.msgSuccess(response.data.Message);
- this.get_MAXNum_Task(1);//璁剧疆娴佹按鍙峰鍔�
- if (response.data.Verify == "Y") //鑷姩瀹℃牳
- {
- this.set_CheckBill(0, this.form); //瀹℃牳
- }
- this.addBtnShow = true
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- }
- })
+ }).catch(error => {
+ console.log(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() {
@@ -1249,6 +1428,10 @@
this.warehouseShow = false
this.materialShow = false
this.gyEmployeeShow = false
+ this.gySourceShow = false
+ this.gySupplierShow = false
+ this.gyCustomerShow = false
+ this.gyStockPlaceShow = false
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
@@ -1262,7 +1445,7 @@
this.deptShow = true
this.openData = true
} else if (num == 2) {
- this.dialogTitle = '鍑哄簱浠撳簱鍒楄〃'
+ this.dialogTitle = '浠撳簱鍒楄〃'
this.warehouseShow = true
this.openData = true
} else if (num == 3) {
@@ -1273,6 +1456,22 @@
this.dialogTitle = '閿�鍞憳鍒楄〃'
this.gyEmployeeShow = true
this.openData = true
+ } else if (num == 5) {
+ this.dialogTitle = '鐢熶骇璧勬簮鍒楄〃'
+ this.gySourceShow = true
+ this.openData = true
+ } else if (num == 6) {
+ this.dialogTitle = '渚涘簲鍟嗗垪琛�'
+ this.gySupplierShow = true
+ this.openData = true
+ } else if (num == 7) {
+ this.dialogTitle = '瀹㈡埛鍒楄〃'
+ this.gyCustomerShow = true
+ this.openData = true
+ } else if (num == 9) {
+ this.dialogTitle = '浠撲綅鍒楄〃'
+ this.gyStockPlaceShow = true
+ this.openData = true
}
},
}
diff --git a/src/views/scMould/basicModeling/Gy_MouldFileList.vue b/src/views/scMould/basicModeling/Gy_MouldFileList.vue
index 4f02606..9a5d999 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFileList.vue
+++ b/src/views/scMould/basicModeling/Gy_MouldFileList.vue
@@ -187,7 +187,7 @@
<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" @editCloseGy="editGyClose" v-if="editShow" />
+ :copyType="copyType" @editClose="editGyClose" v-if="editShow" />
</el-dialog>
<el-dialog :title="upload.title" :visible.sync="upload.open" width="1500px" append-to-body>
<div style="margin-top:-20px ;">
@@ -525,65 +525,65 @@
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
- , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', sort: true }
- , { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鐗╂枡缂栧彿', sort: true }
- , { field: '妯″叿缂栧彿', title: '鍣ㄥ叿缂栧彿', sort: true, }
- , { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', sort: true }
- , { field: '妯″叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿', sort: true }
- , { field: '妯″叿鍝佺被', title: '鍣ㄥ叿鍝佺被', sort: true }
- , { field: '妯″叿鐘舵��', title: '鍣ㄥ叿鐘舵��', sort: true }
- , { field: '妯″叿鍙敤鐘舵��', title: '妯″叿鍙敤鐘舵��', sort: true }
- , { field: '绌存暟', title: '绌存暟', sort: true }
- , { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鍣ㄥ叿ERP鐗╂枡', sort: true }
- , { field: '鐩村緞', title: '鐩村緞', sort: true }
- , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', sort: true }
- , { field: '杈呭姪灞炴��2', title: '杈呭姪灞炴��2', sort: true }
- , { field: '鍥惧彿', title: '鍥惧彿', sort: true }
- , { field: '鐢熶骇浜у搧鍨嬪彿', title: '鐢熶骇浜у搧鍨嬪彿', sort: true }
- , { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', sort: true }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true }
- , { field: '鍑哄巶鏃ユ湡', title: '鍑哄巶鏃ユ湡', sort: true }
- , { field: '鍑哄巶缂栧彿', title: '鍑哄巶缂栧彿', sort: true }
- , { field: '浣跨敤閮ㄩ棬浠ｇ爜', title: '浣跨敤閮ㄩ棬浠ｇ爜', sort: true }
- , { field: '浣跨敤閮ㄩ棬', title: '浣跨敤閮ㄩ棬', sort: true }
- , { field: 'HSupID', title: 'HSupID', hide: true, sort: true }
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', sort: true }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', sort: true }
- , { field: 'HWhID', title: 'HWhID', hide: true, sort: true }
- , { field: '榛樿浠撳簱', title: '榛樿浠撳簱', sort: true }
- , { field: 'HSPID', title: 'HSPID', hide: true, sort: true }
- , { field: '榛樿浠撲綅', title: '榛樿浠撲綅', sort: true }
- , { field: '鐗堟湰', title: '鐗堟湰', sort: true }
- , { field: '褰撳墠浠撳簱', title: '褰撳墠浠撳簱', sort: true }
- , { field: '褰撳墠浠撲綅', title: '褰撳墠浠撲綅', sort: true }
- , { field: '铏氭嫙浠撶被鍨�', title: '铏氭嫙浠撶被鍨�', sort: true }
- , { field: '铏氭嫙浠�', title: '铏氭嫙浠�', sort: true }
- , { field: '褰撳墠妯″叿瑙勬牸', title: '褰撳墠鍣ㄥ叿瑙勬牸', sort: true }
- , { field: '鍒濆妯″叿瑙勬牸', title: '鍒濆鍣ㄥ叿瑙勬牸', sort: true }
- , { field: '褰撳墠璁捐瀵垮懡', title: '褰撳墠璁捐瀵垮懡', sort: true, totalRow: true }
- , { field: '鍒濆璁捐瀵垮懡', title: '鍒濆璁捐瀵垮懡', sort: true, totalRow: true }
- , { field: '浣跨敤瀵垮懡', title: '浣跨敤瀵垮懡', sort: true, totalRow: true }
- , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', sort: true, totalRow: true }
- , { field: '宸茬敓浜ф暟閲�', title: '宸茬敓浜ф暟閲�', sort: true, totalRow: true }
- , { field: '宸茬敓浜ч噸閲�', title: '宸茬敓浜ч噸閲�', sort: true, totalRow: true }
- , { field: '澶囨敞', title: '澶囨敞', sort: true }
- , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', sort: true, totalRow: true }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', sort: true }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', sort: true }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', sort: true }
- , { field: '淇敼浜�', title: '淇敼浜�', sort: true }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', sort: true }
- , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', sort: true }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', sort: true }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�', sort: true }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', sort: true }
- , { field: 'hbilltype', title: 'hbilltype', hide: true, sort: true }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true, sort: true }
- , { field: 'HMoudType', title: 'HMoudType', hide: true, sort: true }
- , { field: 'hsubid', title: 'hsubid', hide: true, sort: true }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 120 }
+ , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', sort: true, width: 120 }
+ , { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鐗╂枡缂栧彿', sort: true, width: 120 }
+ , { field: '妯″叿缂栧彿', title: '鍣ㄥ叿缂栧彿', sort: true, width: 120 }
+ , { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', sort: true, width: 120 }
+ , { field: '妯″叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿', sort: true, width: 120 }
+ , { field: '妯″叿鍝佺被', title: '鍣ㄥ叿鍝佺被', sort: true, width: 120 }
+ , { field: '妯″叿鐘舵��', title: '鍣ㄥ叿鐘舵��', sort: true, width: 120 }
+ , { field: '妯″叿鍙敤鐘舵��', title: '妯″叿鍙敤鐘舵��', sort: true, width: 140 }
+ , { field: '绌存暟', title: '绌存暟', sort: true, width: 120 }
+ , { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鍣ㄥ叿ERP鐗╂枡', sort: true, width: 140 }
+ , { field: '鐩村緞', title: '鐩村緞', sort: true, width: 120 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', sort: true, width: 120 }
+ , { field: '杈呭姪灞炴��2', title: '杈呭姪灞炴��2', sort: true, width: 120 }
+ , { field: '鍥惧彿', title: '鍥惧彿', sort: true, width: 120 }
+ , { field: '鐢熶骇浜у搧鍨嬪彿', title: '鐢熶骇浜у搧鍨嬪彿', sort: true, width: 120 }
+ , { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true, width: 120 }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', sort: true, width: 120 }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true, width: 120 }
+ , { field: '鍑哄巶鏃ユ湡', title: '鍑哄巶鏃ユ湡', sort: true, width: 120 }
+ , { field: '鍑哄巶缂栧彿', title: '鍑哄巶缂栧彿', sort: true, width: 120 }
+ , { field: '浣跨敤閮ㄩ棬浠ｇ爜', title: '浣跨敤閮ㄩ棬浠ｇ爜', sort: true, width: 120 }
+ , { field: '浣跨敤閮ㄩ棬', title: '浣跨敤閮ㄩ棬', sort: true, width: 120 }
+ , { field: 'HSupID', title: 'HSupID', hide: true, sort: true, width: 120 }
+ , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', sort: true, width: 120 }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', sort: true, width: 120 }
+ , { field: 'HWhID', title: 'HWhID', hide: true, sort: true, width: 120 }
+ , { field: '榛樿浠撳簱', title: '榛樿浠撳簱', sort: true, width: 120 }
+ , { field: 'HSPID', title: 'HSPID', hide: true, sort: true, width: 120 }
+ , { field: '榛樿浠撲綅', title: '榛樿浠撲綅', sort: true, width: 120 }
+ , { field: '鐗堟湰', title: '鐗堟湰', sort: true, width: 120 }
+ , { field: '褰撳墠浠撳簱', title: '褰撳墠浠撳簱', sort: true, width: 120 }
+ , { field: '褰撳墠浠撲綅', title: '褰撳墠浠撲綅', sort: true, width: 120 }
+ , { field: '铏氭嫙浠撶被鍨�', title: '铏氭嫙浠撶被鍨�', sort: true, width: 120 }
+ , { field: '铏氭嫙浠�', title: '铏氭嫙浠�', sort: true, width: 120 }
+ , { field: '褰撳墠妯″叿瑙勬牸', title: '褰撳墠鍣ㄥ叿瑙勬牸', sort: true, width: 140 }
+ , { field: '鍒濆妯″叿瑙勬牸', title: '鍒濆鍣ㄥ叿瑙勬牸', sort: true, width: 140 }
+ , { field: '褰撳墠璁捐瀵垮懡', title: '褰撳墠璁捐瀵垮懡', sort: true, totalRow: true, width: 140 }
+ , { field: '鍒濆璁捐瀵垮懡', title: '鍒濆璁捐瀵垮懡', sort: true, totalRow: true, width: 140 }
+ , { field: '浣跨敤瀵垮懡', title: '浣跨敤瀵垮懡', sort: true, totalRow: true, width: 120 }
+ , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', sort: true, totalRow: true, width: 120 }
+ , { field: '宸茬敓浜ф暟閲�', title: '宸茬敓浜ф暟閲�', sort: true, totalRow: true, width: 120 }
+ , { field: '宸茬敓浜ч噸閲�', title: '宸茬敓浜ч噸閲�', sort: true, totalRow: true, width: 120 }
+ , { field: '澶囨敞', title: '澶囨敞', sort: true, width: 120 }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', sort: true, totalRow: true, width: 120 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true, width: 120 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', sort: true, width: 120 }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', sort: true, width: 120 }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', sort: true, width: 120 }
+ , { field: '淇敼浜�', title: '淇敼浜�', sort: true, width: 120 }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', sort: true, width: 120 }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', sort: true, width: 120 }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', sort: true, width: 120 }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', sort: true, width: 120 }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', sort: true, width: 120 }
+ , { field: 'hbilltype', title: 'hbilltype', hide: true, sort: true, width: 120 }
+ , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true, sort: true, width: 120 }
+ , { field: 'HMoudType', title: 'HMoudType', hide: true, sort: true, width: 120 }
+ , { field: 'hsubid', title: 'hsubid', hide: true, sort: true, width: 120 }
]]
this.dataList = option
option.data = data1.data;
@@ -950,9 +950,10 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
+ var ModRightNameDelete = 'Gy_MouldFile_Delete'
if (!this.rowForm.瀹℃牳浜�) {
- axios.get(this.baseURL + "DeltetGy_Source", {
- params: { 'HItemID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
+ axios.get(this.baseURL + "/Gy_Mould_Edit/Delete_Json", {
+ params: { 'HItemID': this.rowForm.hmainid.toString(), "ModRightNameDelete": ModRightNameDelete, 'user': sessionStorage["HUserName"] }
}).then(response => {
if (response.data.count == 1) {
this.getList()
@@ -972,20 +973,25 @@
set_CheckBill(num, form) {
var InterID = form.hmainid || form.HInterID
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.baseURL + "/Gy_Source/AuditGy_Source", {
- params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
- }).then(response => {
- let result = response.data
- if (result.code == 1) {
- this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
- this.getList();
- }
- else {
- this.$modal.msgError("閿欒:" + result.code + result.Message,);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
+ if (form.HBillStatus == 0 && num == 1) {
+ this.$modal.msgSuccess('鍗曟嵁宸蹭负鏈鏍哥姸鎬�,鏃犻渶鍙嶅鏍革紒');
+ } else {
+ axios.get(this.baseURL + "/Gy_Mould/AuditProcessReportList", {
+ params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) {
+ this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.getList();
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }
+
},
// 鍙嶇鐢�/绂佺敤鏁版嵁
set_De_Stop(num, form) {
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill copy.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill copy.vue
new file mode 100644
index 0000000..3331bf6
--- /dev/null
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill copy.vue
@@ -0,0 +1,1088 @@
+<template>
+ <div v-loading="formLoading" v-if="formShow" style="margin: 10px;">
+ <div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
+ <el-button type="primary">棰勮鎵撳嵃</el-button>
+ <el-button type="primary">鐢熸垚</el-button>
+ <el-button type="primary">閲嶇疆</el-button>
+ <el-button type="primary">搴撳瓨</el-button>
+ <el-button type="primary">鍚屾璧勬枡</el-button>
+ <el-button type="primary">鎵规</el-button>
+ <el-button type="primary" @click="close">閫� 鍑�</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-row>
+ <el-col :span="6">
+ <el-form-item label="缁勭粐" prop="HOrgID">
+ <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" @change="organizationChange"
+ style="width: 100%">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name"
+ :value="item.ID">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="宸ュ巶浠ｇ爜" prop="HWorksNumber">
+ <el-select v-model="form.HWorksNumber" placeholder="璇烽�夋嫨缁勭粐" style="width: 100%">
+ <el-option v-for="(item, index) in HWorksNumberList" :key="index" :label="item"
+ :value="item">
+ </el-option>
+ </el-select>
+ </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"
+ style="width: 100%"> </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="婧愬崟绫诲瀷" prop="HSourceBillType">
+ <el-select v-model="form.HSourceBillType" placeholder="璇烽�夋嫨" style="width: 100%"
+ @change="HSourceBillTypeChange">
+ <el-option v-for="(item, index) in HSourceBillTypeList" :key="index" :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="閫夊崟鍙�" prop="HSourceBillNo">
+ <el-input v-model="form.HSourceBillNo" placeholder="璇疯緭鍏ラ�夊崟鍙�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(openNum)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏉＄爜绫诲瀷" prop="HBarCodeType">
+ <el-select v-model="form.HBarCodeType" placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-option v-for="(item, index) in HBarCodeTypeList" :key="index" :label="item"
+ :value="item">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-tabs type="border-card">
+ <el-tab-pane label="鐗╂枡淇℃伅">
+ <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="handleCopyZbRow"
+ size="mini">澶嶅埗涓�琛�</el-button>
+ </div>
+ <el-table :data="editWlxxData" style="width: 100%" height="480" width="100%" ref="wlxxzbTable"
+ @selection-change="handleTableWlxxZbEdit" :row-class-name="wlxxzbRowSysZbIndex" border>
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column align="center" label="搴忓彿" type="index" width="80" fixed />
+ <template v-for="(item, index) in wlxxBtList">
+ <el-table-column align="center" :prop="item.field" :label="item.title" :width="item.width"
+ :key="index" show-overflow-tooltip v-if="!item.hide">
+ <template slot-scope="{row, column }">
+ <div :style="item.style">
+ <el-input v-if="item.edit == 'text'" v-model="row[column.label]" />
+ <el-input-number v-else-if="item.edit == 'number'" v-model="row[column.label]"
+ :min="0" controls-position="right" style="width: 100%;" />
+ <el-date-picker v-else-if="item.edit == 'date'" v-model="row[column.label]"
+ type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT"
+ style="width: 100%"> </el-date-picker>
+ <el-checkbox v-else-if="item.edit == 'checkbox'"
+ v-model="row[column.label]"></el-checkbox>
+ <span v-else>{{ row[column.label] }}</span>
+ </div>
+ </template>
+ </el-table-column>
+ </template>
+ <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-tab-pane>
+ <el-tab-pane label="鏉＄爜淇℃伅">
+ <el-table :data="editTmData" style="width: 100%" height="480" width="100%" ref="tbzbTable"
+ @selection-change="handleTableWlxxZbEdit" :row-class-name="wlxxzbRowSysZbIndex" border>
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column align="center" label="搴忓彿" type="index" width="80" fixed />
+ <template v-for="(item, index) in tmBtList">
+ <el-table-column align="center" :prop="item.field" :label="item.title" :width="item.width"
+ :key="index" show-overflow-tooltip v-if="!item.hide">
+ <template slot-scope="{row, column }">
+ <div :style="item.style">
+ <el-input v-if="item.edit == 'text'" v-model="row[column.label]" />
+ <el-input-number v-else-if="item.edit == 'number'" v-model="row[column.label]"
+ :min="0" controls-position="right" style="width: 100%;" />
+ <el-date-picker v-else-if="item.edit == 'date'" v-model="row[column.label]"
+ type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT"
+ style="width: 100%"> </el-date-picker>
+ <el-checkbox v-else-if="item.edit == 'checkbox'"
+ v-model="row[column.label]"></el-checkbox>
+ <span v-else>{{ row[column.label] }}</span>
+ </div>
+ </template>
+ </el-table-column>
+ </template>
+ <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-tab-pane>
+ <el-tab-pane label="妗ｆ鍒楄〃"><el-table :data="editDaData" style="width: 100%" height="480" width="100%"
+ ref="dazbTable" @selection-change="handleTableWlxxZbEdit" :row-class-name="wlxxzbRowSysZbIndex"
+ border>
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column align="center" label="搴忓彿" type="index" width="80" fixed />
+ <template v-for="(item, index) in daBtList">
+ <el-table-column align="center" :prop="item.field" :label="item.title" :width="item.width"
+ :key="index" show-overflow-tooltip v-if="!item.hide">
+ <template slot-scope="{row, column }">
+ <div :style="item.style">
+ <el-input v-if="item.edit == 'text'" v-model="row[column.label]" />
+ <el-input-number v-else-if="item.edit == 'number'" v-model="row[column.label]"
+ :min="0" controls-position="right" style="width: 100%;" />
+ <el-date-picker v-else-if="item.edit == 'date'" v-model="row[column.label]"
+ type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT"
+ style="width: 100%"> </el-date-picker>
+ <el-checkbox v-else-if="item.edit == 'checkbox'"
+ v-model="row[column.label]"></el-checkbox>
+ <span v-else>{{ row[column.label] }}</span>
+ </div>
+ </template>
+ </el-table-column>
+ </template>
+ <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-tab-pane>
+ </el-tabs>
+ </el-form>
+ <!-- 閮ㄩ棬寮圭獥 -->
+ <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
+ <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
+ <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
+ <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
+ <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
+ <ScICMOBillList @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="ScICMOBillShow" />
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
+ <el-button @click="deptClose">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+ </div>
+</template>
+<script>
+import axios from 'axios'
+import Dept from '@/views/component/dept'
+import Warehouse from '@/views/component/warehouse'
+import Material from '@/views/component/material'
+import RowSettings from '@/views/component/rowSettings'
+import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import ScICMOBillList from '@/views/ICMO/ScICMOBillList.vue'
+import moment from 'moment';
+
+export default {
+ name: 'Gy_BarCodeBill',
+ components: { Dept, Warehouse, Material, RowSettings, GyEmployee, ScICMOBillList },
+ props: {
+ OperationType: { type: Number, },
+ linterid: { type: Number, },
+ HSouceBillType: { type: String, },
+ propsData: { type: String, },
+ copyType: { type: Number, },
+ },
+ data() {
+ return {
+ HModName: "Gy_BarCodeBill",
+ openNum: 10,
+ zbDataShow:true,
+ HSourceBillTypeList: [
+ { value: 1, label: '鐢熶骇璁㈠崟', },
+ { value: 2, label: '鐢熶骇姹囨姤鍗�', },
+ { value: 3, label: '閲囪喘璁㈠崟', },
+ { value: 4, label: '鏀舵枡閫氱煡鍗�', },
+ { value: 5, label: '濮斿璁㈠崟', },
+ { value: 6, label: '鐢熶骇鍏ュ簱鍗�', },
+ { value: 7, label: '閲囪喘鍏ュ簱鍗�', },
+ { value: 8, label: '閿�鍞��璐у崟', },
+ { value: 9, label: '鐢熶骇閫�鏂欏崟', },
+ { value: 10, label: '宸ュ簭娴佽浆鍗�', },
+ { value: 11, label: '閿�鍞嚭搴撳崟', },
+ { value: 12, label: '棰嗘枡鍑哄簱鍗�', }
+ ],
+ wlxxBtList: [{ field: 'HMainID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }
+ , { field: 'HSubID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }
+ , { field: 'HSourceBillSEQ', title: '婧愬崟琛屽彿', width: 100, hide: true }
+ , { field: 'HBillNo', title: '婧愬崟鍗曞彿', width: 200 }
+ , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterNumber', width: 200 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
+ , { field: 'HCusModel', title: '瀹㈡埛瑙勬牸鍨嬪彿', edit: 'text', width: 200 }
+ , { field: 'HCusMaterName', title: '瀹㈡埛鐗╂枡鍚嶇О', edit: 'text', width: 200 }
+ , { field: 'HEmpID', title: '鎿嶄綔鍛業D', width: 100, hide: true }
+ , { field: 'HEmpNumber', title: '鎿嶄綔鍛樹唬鐮�', edit: 'text', width: 200, event: 'HEmpNumber' }
+ , { field: 'HEmpName', title: '鎿嶄綔鍛�', width: 200 }
+ , { field: 'HGroupID', title: '鐝粍ID', width: 100, hide: true }
+ , { field: 'HGroupNumber', title: '鐝粍浠ｇ爜', edit: 'text', width: 200, event: 'HGroupNumber' }
+ , { field: 'HGroupName', title: '鐝粍鍚嶇О', width: 200 }
+ , { field: 'HCheckEmpName', title: '妫�楠屽憳', width: 200, edit: 'text' }
+ , { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
+ , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100, edit: 'text' }
+ , { field: 'HQty', title: '鏁伴噺', edit: 'number', width: 100, totalRow: true }
+ , { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'number', totalRow: true, width: 100 }
+ , { field: 'HBQty', title: '绠辨暟', width: 100, totalRow: true }
+ , { field: 'HPackQty', title: '澶栫鏁�', edit: 'text', width: 100, totalRow: true }
+ , { field: 'HCoilNO', title: '閽㈠嵎鎹嗗寘鍙�', edit: 'text', width: 100 }
+ , { field: 'HFurnaceNO', title: '鐐夊彿', edit: 'text', width: 100 }
+ , { field: 'HFactory', title: '鍘傚晢', edit: 'text', width: 100 }
+ , { field: 'HCusID', title: '瀹㈡埛ID', width: 100, hide: true }
+ , { field: 'HCusNumber', title: '瀹㈡埛浠ｇ爜', edit: 'text', event: 'HCusNumber', width: 120 }
+ , { field: 'HCusName', title: '瀹㈡埛鍚嶇О', width: 120 }
+ , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200 }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+ , { field: 'HProduceDate', title: '鐢熶骇鏃ユ湡', edit: 'date', event: 'HProduceDate', width: 160 }
+ , { field: 'HExpiryDate', title: '淇濊川鏈熻嚦', edit: 'date', event: 'HExpiryDate', width: 160 }
+ , { field: 'HheatNO', title: '鐑鐞�', edit: 'text', width: 100 }
+ , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 100, hide: true }
+ , { field: 'HAuxPropNumber', title: '杈呭姪灞炴�т唬鐮�', edit: 'text', event: 'HAuxPropNumber', width: 100 }
+ , { field: 'HAuxPropName', title: '杈呭姪灞炴�у悕绉�', width: 100 }
+ , { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
+ , { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitNumber', width: 100 }
+ , { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
+ , { field: 'HAuxQty', title: '杈呭崟浣嶆暟閲�', edit: 'text', width: 100, totalRow: true }
+ , { field: 'HExpirationDateFlag', title: '鏄惁鍚敤淇濊川鏈�', width: 120, edit: 'checkbox', templet: '#switchTp3', unresize: false }
+ , { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, edit: 'checkbox', templet: '#switchTpl', unresize: false }
+ , { field: 'HDate', title: '鏉＄爜鏃ユ湡', width: 100, hide: true }
+ ],
+ tmBtList: [
+ { field: 'HBarCode2', title: '鏉＄爜缂栧彿', width: 100 }
+ , { field: 'HMaterNumber2', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: 'HMaterName2', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: 'HMaterModel2', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: 'HAuxPropNumber2', title: '杈呭姪灞炴�т唬鐮�', width: 100 }
+ , { field: 'HAuxPropName2', title: '杈呭姪灞炴��', event: 'HWHCode', width: 120 }
+ , { field: 'HGiveAwayFlag2', title: '鏄惁璧犲搧', width: 120, templet: '#switchTpl', unresize: false }
+ , { field: 'HUnitCode2', title: '璁￠噺鍗曚綅浠ｇ爜', width: 120 }
+ , { field: 'HUnitName2', title: '璁￠噺鍗曚綅', width: 120 }
+ , { field: 'HQty2', title: '鏁伴噺', width: 120 }
+ , { field: 'HDate2', title: '杩涙枡鏃ユ湡', width: 120 }
+ , { field: 'HCusNumber2', title: '瀹㈡埛浠ｇ爜', width: 120 }
+ , { field: 'HCusName2', title: '瀹㈡埛', width: 120 }
+ , { field: 'HSourceBillNo2', title: '婧愬崟鍗曞彿', width: 120 }
+ , { field: 'HSeOrderBillNo2', title: '閿�鍞鍗曞彿', width: 120 }
+ , { field: 'HRemark2', title: '澶囨敞', width: 120 }
+ , { field: 'HMTONo2', title: '璁″垝璺熻釜鍙�', width: 120 }
+ , { field: 'HShowDate2', title: '鏃ユ湡', width: 100 }
+ , { field: 'HInnerBillNo2', title: '鍐呴儴閲囪喘璁㈠崟鍙�', width: 100 }
+ , { field: 'HMaker2', title: '鍒跺崟浜�', width: 100 }
+ ],
+ daBtList: [
+ { field: 'HItemID', title: 'HItemID', width: 100, hide: true }
+ , { field: 'hmainid', title: 'hmainid', width: 100, hide: true }
+ , { field: 'hsubid', title: 'hsubid', width: 100, hide: true }
+ , { field: 'HinterID', title: 'HinterID', width: 100, hide: true }
+ , { field: '鏉＄爜绫诲瀷', title: '鏉＄爜绫诲瀷', width: 100 }
+ , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 120 }
+ , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 120 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120 }
+ , { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 120 }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 120 }
+ , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 100, hide: true }
+ , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�', width: 120 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 120 }
+ , { field: '鎵瑰彿', title: '鎵瑰彿', width: 120 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 120 }
+ , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 120 }
+ , { field: '鏄惁璧犲搧', title: '鏄惁璧犲搧', width: 100 }
+ , { field: 'DeptID', title: '杞﹂棿ID', width: 100, hide: true }
+ , { field: '杞﹂棿', title: '杞﹂棿', width: 120 }
+ , { field: 'HSupID', title: '渚涘簲鍟咺D', width: 100, hide: true }
+ , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120 }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 120 }
+ , { field: '瀹㈡埛鏉＄爜缂栧彿', title: '瀹㈡埛鏉＄爜缂栧彿', width: 120 }
+ , { field: '瀹㈡埛鍨嬪彿', title: '瀹㈡埛鍨嬪彿', width: 120 }
+ , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 120 }
+ , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 120 }
+ , { field: '閿�鍞鍗曡鍙�', title: '閿�鍞鍗曡鍙�', width: 120 }
+ , { field: '鎵樺彿', title: '鎵樺彿', width: 120 }
+ , { field: '鎬绘墭鏁�', title: '鎬绘墭鏁�', width: 100 }
+ , { field: '鏉＄爜鏃ユ湡', title: '鏉＄爜鏃ユ湡', width: 120 }
+ , { field: '鐢熶骇鍏ュ簱鏃ユ湡', title: '鐢熶骇鍏ュ簱鏃ユ湡', width: 120 }
+ , { field: '鐢熶骇鍏ュ簱鍗曞彿', title: '鐢熶骇鍏ュ簱鍗曞彿', width: 120 }
+ , { field: '鐢熶骇鍏ュ簱娆℃暟', title: '鐢熶骇鍏ュ簱娆℃暟', width: 100 }
+ , { field: '閿�鍞嚭搴撴棩鏈�', title: '閿�鍞嚭搴撴棩鏈�', width: 120 }
+ , { field: '閿�鍞嚭搴撳崟鍙�', title: '閿�鍞嚭搴撳崟鍙�', width: 120 }
+ , { field: '閿�鍞嚭搴撴鏁�', title: '閿�鍞嚭搴撴鏁�', width: 100 }
+ , { field: '浣滃簾鏍囪', title: '浣滃簾鏍囪', width: 100 }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 100 }
+ , { field: '澶囨敞', title: '澶囨敞', width: 120 }
+ , { field: '鍒朵綔浜�', title: '鍒朵綔浜�', width: 100 }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120 }
+ , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', width: 120 }
+ , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', width: 100 }
+ , { field: 'HSTOCKORGID', title: 'HSTOCKORGID', width: 100, hide: true }
+ , { field: '鐢熸垚缁勭粐', title: '鐢熸垚缁勭粐', width: 120 }
+ ],
+ HBarCodeTypeList: [],
+ HWorksNumberList: [],
+ 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,//閿�鍞憳鏁版嵁缁勪欢
+ ScICMOBillShow: false,
+ deptform: {},//寮圭獥閫変腑鏁版嵁
+ openData: false,//鏁版嵁寮圭獥
+ dialogTitle: '',
+ organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
+ subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+ // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+ HInterID: null,
+ baseURL: process.env.VUE_APP_BASE_API,
+ checkedSysZb: [],
+ editWlxxData: [],//瀛愯〃
+ editTmData: [],
+ editDaData: [],
+ 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: {
+ HSupName: [
+ { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HDate: [
+ { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HExRate: [
+ { required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }
+ ]
+ }
+ };
+ },
+ created() {
+ this.set_HBarCodeType()
+ this.getdata()
+ },
+ methods: {
+ HSourceBillTypeChange(val) {
+ if (val == 1) {
+ this.openNum == 10
+ }
+ },
+ set_HBarCodeType() {
+ //鑾峰彇鏉＄爜绫诲瀷浠ｇ爜
+ axios.get(this.baseURL + '/Sc_BarCode/GetHBarCodeTypeBill').then(response => {
+ console.log(response)
+ let result = response.data
+ if (result.count == 1) {
+ this.HBarCodeTypeList = result.list
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ axios.get(this.baseURL + '/Sc_BarCode/GetHWorksNumberBill').then(response => {
+ console.log(response)
+ let result = response.data
+ if (result.count == 1) {
+ this.HWorksNumberList = result.list
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+
+ },
+ getdata() {
+ console.log(this.copyType, this.OperationType)
+ this.formShow = false
+ this.formLoading = true
+ if (this.OperationType == 4) {
+ this.zzSelDis = true
+ this.handleAdd()
+ var data = this.getUrlVars_JSON();
+ var dataArray = [];
+ for (var i = 0; i < data.length; i++) {
+ // this.getPushSourceBillInit(data[i].hmainid, data[i].hsubid);
+ axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
+ params: {
+ "HInterID": data[i].hmainid
+ , "HSubID": data[i].hsubid
+ },
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ this.temp = result.data[0];
+ } else {
+ this.temp = result.data;
+ }
+ if (this.temp) {
+ dataArray.push(this.temp);
+ this.form.HDeptID = dataArray[0].HDeptID
+ this.form.HDeptName = dataArray[0].閮ㄩ棬
+ this.form.HEmpID = dataArray[0].HEmpID
+ this.form.HEmpName = dataArray[0].涓氬姟鍛�
+ this.form.HManagerID = dataArray[0].HManagerID
+ this.form.HManagerName = dataArray[0].涓荤
+ this.form.HMainSourceInterID = "0"
+ this.form.HMainSourceEntryID = "0"
+ this.form.HMainSourceBillNo = ""
+ this.form.HMainSourceBillType = dataArray[0].HBillType
+ this.form.HSupID = dataArray[0].HCusID
+ this.form.HSupName = dataArray[0].瀹㈡埛
+ this.form.HLinkMan = dataArray[0].鑱旂郴浜�
+ this.form.HLinkPhone = dataArray[0].鑱旂郴鐢佃瘽
+ this.form.HSellSID = dataArray[0].HSellSID
+ this.form.HSellSName = dataArray[0].閿�鍞柟寮�
+ this.form.HCurID = dataArray[0].HCurID
+ this.form.HCurName = dataArray[0].甯佸埆
+ this.form.HExRate = dataArray[0].姹囩巼
+ for (var i = 0; i < dataArray.length; i++) {
+ this.editWlxxData.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQtyMust": dataArray[i].鏁伴噺.toFixed(6)
+ , "HQty": dataArray[i].鏁伴噺.toFixed(6)
+ , "HPieceQty": "0"
+ , "HPrice": dataArray[i].鍗曚环.toFixed(4)
+ , "HTaxPrice": dataArray[i].瀹為檯鍚◣鍗曚环.toFixed(4)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , "HMoney": dataArray[i].閲戦.toFixed(2)
+ , "HTaxMoney": dataArray[i].浠风◣鍚堣.toFixed(2)
+ , "HWHID": dataArray[i].HWHID
+ , "鍙戣揣浠撳簱": dataArray[i].HWHName
+ , "HRemark": ""
+ , "HQty_Full": "0"
+ , "HQty_Empty": "0"
+ , "HQty_Back": "0"
+ , "HCostPrice": "0"
+ , "HCostMoney": "0"
+ , "HSalePrice": "0"
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+ , 'HSPID': "0"
+ , 'HSPName': ""
+ , 'HSPGroupID': "0"
+ , "HSPGroupName": ""
+ , 'HSCWHID': "0"
+ , 'HSCWHName': ""
+ , 'HSCSPID': "0"
+ , 'HSCSPName': ""
+ , 'HBatchNo': ""
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+ , 'HPropertyID': "0"
+ , 'HPropertyName': ""
+ , 'HSecUnitID': "0"
+ , 'HSecUnitName': ""
+ , 'HSecUnitRate': "0"
+ , 'HEngineNum': ""
+ , 'HUnderPanNum': ""
+ , 'HLeaveFactCard': ""
+ , 'HReqBuyQty': "0"
+ , 'HReqOutQty': "0"
+ , 'HCurrentInventory': "0"
+ }
+ );
+ }
+ }
+ this.$nextTick(() => {
+ this.formShow = true
+ this.formLoading = false
+ })
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }
+ } else 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鍑哄簱浠撳簱
+ console.log(deptRow)
+ if (deptRow.length>0) {
+ if (num == 1) {
+ this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
+ this.form.HDeptID = deptRow.HItemID
+ this.form.HManagerName = deptRow.璐熻矗浜�
+ this.deptShow = false
+ this.openData = false
+ } else if (num == 2) {
+ 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) {
+ this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
+ this.form.HEmpID = deptRow.HItemID
+ this.gyEmployeeShow = false
+ this.openData = false
+ } else if (num == 10) {
+ this.zbDataShow=false
+ let data=deptRow
+ this.editWlxxData=[]
+ for (var i = 0; i < data.length; i++) {
+ this.editWlxxData.push({
+ "HMaterID": data[i].HMaterID, "HMaterCode": "", "HMaterNumber": data[i].鐗╂枡浠ｇ爜, "HMaterName": data[i].鐗╂枡鍚嶇О
+ , "HMaterModel": data[i].瑙勬牸鍨嬪彿, "HMaterSpec": "", "HBatchNo": data[i].鎵规, "HUnitID": data[i].HUnitID
+ , "HUnitNumber": data[i].璁￠噺鍗曚綅浠ｇ爜, "HUnitName": data[i].璁￠噺鍗曚綅, "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0
+ , "HQtyMust": 0, "HQty": data[i].鏁伴噺, "HBQty": 1, "HMinQty": data[i].鏁伴噺, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0
+ , "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"]
+ , "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "", "HAuxQty": 0, "HheatNO": "", "HProduceDate": moment(new Date()).format('YYYY-MM-DD')
+ , "HExpiryDate": moment(new Date()).format('YYYY-MM-DD'), "HExpirationDateFlag": data[i].HISKFPERIOD == false ? 0 : 1
+ , "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"]
+ , "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": data[i].璁″垝璺熻釜鍙�, "HCusModel": "", "HCusMaterName": ""
+ , "HCheckEmpName": ""
+ })
+ }
+ console.log( this.editWlxxData)
+ this.ScICMOBillShow = false
+ this.zbDataShow=true
+ 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 = {
+ HOrgID: sessionStorage["OrganizationID"] - 0,
+ HWorksNumber: '',
+ HDate: moment(new Date()).format('YYYY-MM-DD'),
+ HSourceBillType: 1,
+ HSourceBillNo: '',
+ HBarCodeType: '',
+ }
+ this.editWlxxData = []
+ this.editBtData = []
+ this.ids = []
+ this.subDisabled = false
+ this.addBtnShow = false
+ // this.$refs.tableData.clearSelection()
+ this.activeName = 'first'
+ this.resetForm("form");
+ },
+ //閫�鍑�
+ close() {
+ this.reset()
+ console.log(1111)
+ console.log(this.$route.path)
+ if (!this.OperationType && !this.copyType) {
+ console.log(this.$route.path)
+ 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.handleAddSysZb()
+ this.$nextTick(() => {
+ this.formShow = true
+ this.formLoading = false
+ })
+ },
+ //鑾峰彇瀵瑰簲鐨勬潯鐮佹槑缁�
+ getBarCodeNoteBySellOutBill(rowHmainid) {
+ axios.get(this.baseURL + '/Kf_SellOutBill/BarCodeNote', {
+ params: { "HInterID": rowHmainid }
+ }).then(response => {
+ if (response.data.count == 1) {
+ if (response.data.data[2].length > 0) {
+ this.$modal.msgError("褰撳墠鍗曟嵁鐢辨壂鐮佺敓鎴愶紝涓嶅彲浠ョ紪杈戯紒");
+ this.subDisabled = true
+ }
+ } else { }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
+ getCustomerBalance(HCusID) {
+ axios.get(this.baseURL + '/Xs_CusRatingChangeBill/getCustomerBalance', {
+ params: { "HCusID": HCusID, 'CurUserName': sessionStorage["HUserName"] }
+ }).then(response => {
+ var data = response.data.data[0];
+ this.form.HCusBalance = data.HCusBalance
+ this.form.HCreditRating_Now = data.HCreditRating_Now
+ this.form.HAvailableBalance = data.HAvailableBalance
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate() {
+ this.reset()
+ let rowHmainid = this.linterid
+ console.log(this.linterid)
+ axios.get(this.baseURL + "/Kf_SellOutBill/cx", {
+ params: { 'HInterID': rowHmainid }
+ }).then(response => {
+ if (response.data.count == 1) {
+ var result = response.data
+ var data = response.data.data[0]
+ this.form.BillType = data.HSourceBillType
+ if (this.copyType == 1) {
+ let date = new Date()
+ this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ } else {
+ this.form.HBillNo = data.鍗曟嵁鍙�
+ this.form.HInterID = data.hmainid
+ 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.HBillSubType = data.HBillSubType
+ this.form.HMainSourceInterID = data.HMainSourceInterID
+ this.form.HMainSourceEntryID = data.HMainSourceEntryID
+ this.form.HMainSourceBillType = data.HMainSourceBillType
+ this.form.HMainSourceBillNo = data.HMainSourceBillNo
+ this.form.HEmpName = data.涓氬姟鍛�
+ this.form.HEmpID = data.HEmpID
+ this.form.HDeptName = data.閮ㄩ棬
+ this.form.HDeptID = data.HDeptID
+ this.form.HManagerName = data.涓荤
+ this.form.HManagerID = data.HManagerID
+ this.form.HSupName = data.瀹㈡埛
+ this.form.HSupID = data.HSupID
+ this.form.HLinkMan = data.鑱旂郴浜�
+ this.form.HLinkPhone = data.鑱旂郴鐢佃瘽
+ this.form.HSecManagerName = data.鍙戣揣浜�
+ this.form.HSecManagerID = data.HSecManagerID
+ this.form.HKeeperName = data.淇濈鍛�
+ this.form.HKeeperID = data.HKeeperID
+ this.form.HRemark = data.琛ㄥご澶囨敞
+ this.form.HProjectNumber = data.椤圭洰缂栫爜
+ this.form.HProjectID = data.HProjectID
+ this.form.HProjectName = data.椤圭洰鍚嶇О
+ this.form.HGroupName = data.鐝粍
+ this.form.HGroupID = data.HGroupID
+ this.form.HWHName = data.涓昏〃浠撳簱
+ this.form.HWHID = data.HWHID_Main
+ this.form.HConveyCompName = data.杩愯緭鍏徃
+ this.form.HConveyCompID = data.HConveyCompID
+ this.form.HConveyTypeName = data.杩愯緭鏂瑰紡
+ this.form.HConveyTypeID = data.HConveyTypeID
+ this.form.HConveyMoney = data.HConveyMoney
+ this.form.HCarriage = data.杩愯垂
+ this.form.HSTOCKORGID = data.HSTOCKORGID
+ this.form.HOWNERID = data.HOWNERID
+ this.form.HSCWHName = data.涓昏〃璋冨嚭浠撳簱
+ this.form.HSCWHID = data.HSCWHID
+ this.form.HCheckStatusMan = data.鏍搁攢浜�
+ this.form.HExplanation = data.鎽樿
+ this.form.HInnerBillNo = data.鍐呴儴鍗曟嵁鍙�
+ this.form.HCurName = data.甯佸埆
+ this.form.HCurID = data.HCurID
+ this.form.HExRate = data.姹囩巼
+ this.form.HSellSName = data.閿�鍞柟寮�
+ this.form.HSellSID = data.HSellSID
+ // this.form.HCusBalance=data
+ // this.form.HCreditRating_Now=HConveyMoney
+ // this.form.HAvailableBalance=data
+ this.form.HPriceType = data.鍗曚环绫诲瀷
+ this.form.HOrgID = data.HOrgID
+ this.getCustomerByCusID(response.data.data[0].HSupID)//鏍规嵁瀹㈡埛鑾峰彇鑱旂郴浜猴紝鑱旂郴浜虹數璇�
+ this.getBarCodeNoteBySellOutBill(rowHmainid)//鑾峰彇瀵瑰簲鐨勬潯鐮佹槑缁嗘槸鍚﹀彲缂栬緫
+ for (var i = 0; i < result.data.length; i++) {
+ this.editWlxxData.push(
+ {
+ "HMaterID": result.data[i].HMaterID
+ , "鐗╂枡浠ｇ爜": result.data[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
+ , "HUnitID": result.data[i].HUnitID
+ , "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅
+ , "HQtyMust": result.data[i].搴斿彂鏁伴噺.toFixed(6)
+ , "HQty": result.data[i].鏁伴噺.toFixed(6)
+ , "HPieceQty": result.data[i].浠舵暟.toFixed(0)
+ , "HPrice": result.data[i].鍗曚环.toFixed(4)
+ , "HTaxPrice": result.data[i].鍚◣鍗曚环.toFixed(4)
+ , "HTaxRate": result.data[i].绋庣巼
+ , "HMoney": (result.data[i].鏁伴噺 * result.data[i].鍗曚环).toFixed(2)
+ , "HTaxMoney": (result.data[i].鏁伴噺 * result.data[i].鍚◣鍗曚环, 2).toFixed(2)
+ , "HWHID": result.data[i].hwhid
+ , "鍙戣揣浠撳簱": result.data[i].鍙戣揣浠撳簱
+ , "HRemark": result.data[i].琛ㄤ綋澶囨敞
+ , "HQty_Full": result.data[i].婊¤溅閲嶉噺
+ , "HQty_Empty": result.data[i].绌鸿溅閲嶉噺
+ , "HQty_Back": result.data[i].鍥炶溅閲嶉噺
+ , "HCostPrice": result.data[i].鎴愭湰鍗曚环
+ , "HCostMoney": result.data[i].鎴愭湰閲戦
+ , "HSalePrice": result.data[i].閿�鍞崟浠�
+ , "HSeOrderInterID": result.data[i].HSeOrderInterID
+ , "HSeOrderEntryID": result.data[i].HSeOrderEntryID
+ , "HSeOrderBillNo": result.data[i].閿�鍞鍗曞彿
+ , "HSourceInterID": result.data[i].HSourceInterID
+ , "HSourceEntryID": result.data[i].HSourceEntryID
+ , "HSourceBillNo": result.data[i].婧愬崟鍗曞彿
+ , "HSourceBillType": result.data[i].HSourceBillType
+ , "HRelationQty": result.data[i].鍏宠仈鏁伴噺
+ , "HRelationMoney": result.data[i].鍏宠仈閲戦
+ , 'HSPID': result.data[i].HSPID
+ , 'HSPName': result.data[i].浠撲綅
+ , 'HSPGroupID': result.data[i].HSPGroupID
+ , "HSPGroupName": result.data[i].浠撲綅缁�
+ , 'HSCWHID': result.data[i].HSCWHID
+ , 'HSCWHName': result.data[i].璋冨嚭浠撳簱
+ , 'HSCSPID': result.data[i].HSCSPID
+ , 'HSCSPName': result.data[i].璋冨嚭浠撲綅
+ , 'HBatchNo': result.data[i].鎵规
+ , 'HPOOrderInterID': result.data[i].閲囪喘璁㈠崟鍐呯爜
+ , 'HPOOrderEntryID': result.data[i].閲囪喘璁㈠崟瀛愬唴鐮�
+ , 'HPOOrderBillNo': result.data[i].閲囪喘璁㈠崟鍙�
+ , 'HPropertyID': result.data[i].HPropertyID
+ , 'HPropertyName': result.data[i].杈呭姪灞炴��
+ , 'HSecUnitID': result.data[i].HSecUnitID
+ , 'HSecUnitName': result.data[i].杈呭姪璁￠噺鍗曚綅
+ , 'HSecUnitRate': result.data[i].鎹㈢畻鐜�
+ , 'HEngineNum': result.data[i].鍙戝姩鏈哄彿
+ , 'HUnderPanNum': result.data[i].鍦扮洏鍙�
+ , 'HLeaveFactCard': result.data[i].鍑哄巶璇�
+ , 'HReqBuyQty': result.data[i].鐢宠閲囪喘鏁伴噺
+ , 'HReqOutQty': result.data[i].鐢宠鍑哄簱鏁伴噺
+ , 'HCurrentInventory': result.data[i].褰撳墠搴撳瓨
+ }
+ );
+ }
+ if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
+ this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
+ this.subDisabled = true
+ }
+ this.formShow = true
+ this.formLoading = false
+
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
+ getCustomerByCusID(HCusID) {
+ axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
+ params: {
+ HCusID: HCusID
+ }
+ }).then(response => {
+ this.form.鑱旂郴浜� = response.data.data[0].HLinkMan
+ this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone
+ // this.form = response.data.data[0]
+
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ /** 閿�鍞嚭搴撳瓙琛ㄦ槑缁嗗簭鍙� */
+ wlxxzbRowSysZbIndex({ row, rowIndex }) {
+ row.index = rowIndex + 1;
+ },
+ /** 缂栬緫椤靛瓙琛ㄦ坊鍔犳寜閽搷浣� */
+ handleAddSysZb(index, num) {
+ if (num == 1 && !index) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
+ } else {
+ let obj = {
+ HMainID: 0,
+ HSubID: 0,
+ HSourceBillSEQ: '',
+ HBillNo: '',
+ HMaterID: '',
+ HMaterNumber: '',
+ HMaterName: '',
+ HMaterModel: '',
+ HCusModel: '',
+ HCusMaterName: '',
+ HEmpID: 0,
+ HEmpNumber: '',
+ HEmpName: '',
+ HGroupID: 0,
+ HGroupNumber: '',
+ HGroupName: '',
+ HCheckEmpName: '',
+ HBatchNo: '',
+ HMTONo: '',
+ HQty: 0,
+ HMinQty: 0,
+ HBQty: 0,
+ HPackQty: '',
+ HCoilNO: '',
+ HFurnaceNO: '',
+ HFactory: '',
+ HCusID: 0,
+ HCusNumber: '',
+ HCusName: '',
+ HSeOrderBillNo: '',
+ HRemark: '',
+ HProduceDate: this.form.HDate,
+ HExpiryDate: this.form.HDate,
+ HheatNO: '',
+ HAuxPropID: 0,
+ HAuxPropNumber: '',
+ HAuxPropName: '',
+ HUnitID: 0,
+ HUnitNumber: '',
+ HUnitName: '',
+ HAuxQty: '',
+ HExpirationDateFlag: '',
+ HGiveAwayFlag: '',
+ HDate: this.form.HDate,
+ }
+ if (index) {
+ this.editWlxxData.splice(index, 0, obj);
+ this.$set(this.editWlxxData, index, obj)
+ } else {
+ this.editWlxxData.push(obj);
+ }
+ }
+ },
+ handleCopyZbRow() {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
+ this.editWlxxData.push(copyRow);
+ }
+ },
+ /** 缂栬緫椤靛瓙琛ㄥ垹闄ゆ寜閽搷浣� */
+ handleDeleteSysZb(row) {
+ this.checkedSysZb = []
+ this.checkedSysZb.push(row.index)
+ if (this.checkedSysZb.length == 0) {
+ this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑鍟嗗搧璁㈠崟鏄庣粏鏁版嵁");
+ } else {
+ const editWlxxData = this.editWlxxData;
+ const checkedSysZb = this.checkedSysZb;
+ this.editWlxxData = editWlxxData.filter(function (item) {
+ return checkedSysZb.indexOf(item.index) == -1
+ });
+ }
+ },
+ /** 缂栬緫椤靛瓙琛ㄥ閫夋閫変腑鏁版嵁 */
+ handleTableWlxxZbEdit(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.wlxxzbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ },
+ showReset() {
+ this.deptShow = false
+ this.warehouseShow = false
+ this.materialShow = false
+ this.gyEmployeeShow = false
+ this.ScICMOBillShow = 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 == 10) {
+ this.dialogTitle = '鐢熶骇璁㈠崟鍒楄〃'
+ this.ScICMOBillShow = true
+ this.openData = true
+ }
+ },
+ }
+};
+</script>
\ No newline at end of file
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
index c3f0161..1bb21c8 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
@@ -41,7 +41,8 @@
<el-row>
<el-col :span="6">
<el-form-item label="婧愬崟绫诲瀷" prop="HSourceBillType">
- <el-select v-model="form.HSourceBillType" placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-select v-model="form.HSourceBillType" placeholder="璇烽�夋嫨" style="width: 100%"
+ @change="HSourceBillTypeChange">
<el-option v-for="(item, index) in HSourceBillTypeList" :key="index" :label="item.label"
:value="item.value">
</el-option>
@@ -51,7 +52,7 @@
<el-col :span="6">
<el-form-item label="閫夊崟鍙�" prop="HSourceBillNo">
<el-input v-model="form.HSourceBillNo" placeholder="璇疯緭鍏ラ�夊崟鍙�" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4)"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(openNum)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -76,25 +77,125 @@
<el-table :data="editWlxxData" style="width: 100%" height="480" width="100%" ref="wlxxzbTable"
@selection-change="handleTableWlxxZbEdit" :row-class-name="wlxxzbRowSysZbIndex" border>
<el-table-column type="selection" width="55" align="center" />
- <el-table-column align="center" label="搴忓彿" type="index" width="80" fixed />
- <template v-for="(item, index) in wlxxBtList">
- <el-table-column align="center" :prop="item.field" :label="item.title" :width="item.width"
- :key="index" show-overflow-tooltip v-if="!item.hide">
- <template slot-scope="{row, column }">
- <div :style="item.style">
- <el-input v-if="item.edit == 'text'" v-model="row[column.label]" />
- <el-input-number v-else-if="item.edit == 'number'" v-model="row[column.label]"
- :min="0" controls-position="right" style="width: 100%;" />
- <el-date-picker v-else-if="item.edit == 'date'" v-model="row[column.label]"
- type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT"
- style="width: 100%"> </el-date-picker>
- <el-checkbox v-else-if="item.edit == 'checkbox'"
- v-model="row[column.label]"></el-checkbox>
- <span v-else>{{ row[column.label] }}</span>
- </div>
- </template>
- </el-table-column>
- </template>
+ <el-table-column align="center" label="搴忓彿" type="index" width="80" fixed show-overflow-tooltip/>
+ <el-table-column align="center" label="婧愬崟鍗曞彿" prop="HBillNo" width="120" show-overflow-tooltip>
+ <template slot-scope="scope">{{ scope.row.HBillNo }} </template>
+ </el-table-column>
+ <el-table-column align="center" label="鐗╂枡浠ｇ爜" prop="HMaterNumber" width="120" show-overflow-tooltip>
+ <template slot-scope="scope"><el-input v-model="scope.row.HMaterNumber" /></template>
+ </el-table-column>
+ <el-table-column align="center" label="鐗╂枡鍚嶇О" prop="HMaterName" width="120" show-overflow-tooltip>
+ <template slot-scope="scope">{{ scope.row.HMaterName }}</template>
+ </el-table-column>
+ <el-table-column align="center" label="瑙勬牸鍨嬪彿" prop="HMaterModel" width="120" show-overflow-tooltip>
+ <template slot-scope="scope">{{ scope.row.HMaterModel }}</template>
+ </el-table-column>
+ <el-table-column align="center" label="瀹㈡埛瑙勬牸鍨嬪彿" prop="HCusModel" width="120" show-overflow-tooltip>
+ <template slot-scope="scope"><el-input v-model="scope.row.HCusModel" /></template>
+ </el-table-column>
+ <el-table-column align="center" label="瀹㈡埛鐗╂枡鍚嶇О" prop="HCusMaterName" width="120" show-overflow-tooltip>
+ <template slot-scope="scope"> <el-input v-model="scope.row.HCusMaterName" /></template>
+ </el-table-column>
+ <el-table-column align="center" label="鎿嶄綔鍛樹唬鐮�" prop="HEmpNumber" width="120" show-overflow-tooltip>
+ <template slot-scope="scope"> <el-input v-model="scope.row.HEmpNumber" /></template>
+ </el-table-column>
+ <el-table-column align="center" label="鎿嶄綔鍛�" prop="HEmpName" width="120" show-overflow-tooltip>
+ <template slot-scope="scope">{{ scope.row.HEmpName }}</template>
+ </el-table-column>
+ <el-table-column align="center" label="鐝粍浠ｇ爜" prop="HGroupNumber" width="120" show-overflow-tooltip>
+ <template slot-scope="scope"><el-input v-model="scope.row.HGroupNumber" /></template>
+ </el-table-column>
+ <el-table-column align="center" label="鐝粍鍚嶇О" prop="HGroupName" width="120" show-overflow-tooltip>
+ <template slot-scope="scope">{{ scope.row.HGroupName }}</template>
+ </el-table-column>
+ <el-table-column align="center" label="妫�楠屽憳" prop="HCheckEmpName" width="120" show-overflow-tooltip>
+ <template slot-scope="scope"><el-input v-model="scope.row.HCheckEmpName" /></template>
+ </el-table-column>
+ <el-table-column align="center" label="鎵瑰彿" prop="HBatchNo" width="120" show-overflow-tooltip>
+ <template slot-scope="scope"><el-input v-model="scope.row.HBatchNo" /></template>
+ </el-table-column>
+ <el-table-column align="center" label="璁″垝璺熻釜鍙�" prop="HMTONo" width="120" show-overflow-tooltip>
+ <template slot-scope="scope"><el-input v-model="scope.row.HMTONo" /></template>
+ </el-table-column>
+ <el-table-column align="center" label="鏁伴噺" prop="HQty" width="120" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.HQty" :min="0" controls-position="right"
+ style="width: 100%;" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鏈�灏忓寘瑁呮暟" prop="HMinQty" width="120" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.HMinQty" :min="0" controls-position="right"
+ style="width: 100%;" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="绠辨暟" prop="HBQty" width="120" show-overflow-tooltip>
+ <template slot-scope="scope">{{ scope.row.HBQty }}</template>
+ </el-table-column>
+ <el-table-column align="center" label="澶栫鏁�" prop="HPackQty" width="120" show-overflow-tooltip>
+ <template slot-scope="scope"><el-input v-model="scope.row.HPackQty" /></template>
+ </el-table-column>
+ <el-table-column align="center" label="閽㈠嵎鎹嗗寘鍙�" prop="HCoilNO" width="120" show-overflow-tooltip>
+ <template slot-scope="scope"><el-input v-model="scope.row.HCoilNO" /></template>
+ </el-table-column>
+ <el-table-column align="center" label="鐐夊彿" prop="HFurnaceNO" width="120" show-overflow-tooltip>
+ <template slot-scope="scope"><el-input v-model="scope.row.HFurnaceNO" /></template>
+ </el-table-column>
+ <el-table-column align="center" label="鍘傚晢" prop="HFactory" width="120" show-overflow-tooltip>
+ <template slot-scope="scope"><el-input v-model="scope.row.HFactory" /></template>
+ </el-table-column>
+ <el-table-column align="center" label="瀹㈡埛浠ｇ爜" prop="HCusNumber" width="120" show-overflow-tooltip>
+ <template slot-scope="scope"><el-input v-model="scope.row.HCusNumber" /></template>
+ </el-table-column>
+ <el-table-column align="center" label="瀹㈡埛鍚嶇О" prop="HCusName" width="120" show-overflow-tooltip>
+ <template slot-scope="scope">{{ scope.row.HCusName }}</template>
+ </el-table-column>
+ <el-table-column align="center" label="閿�鍞鍗曞彿" prop="HSeOrderBillNo" width="120" show-overflow-tooltip>
+ <template slot-scope="scope">{{ scope.row.HSeOrderBillNo }}</template>
+ </el-table-column>
+ <el-table-column align="center" label="澶囨敞" prop="HRemark" width="120" show-overflow-tooltip>
+ <template slot-scope="scope">{{ scope.row.HRemark }}</template>
+ </el-table-column>
+ <el-table-column align="center" label="鐢熶骇鏃ユ湡" prop="HProduceDate" width="120" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <el-date-picker v-model="scope.row.HProduceDate" type="date" placeholder="閫夋嫨鏃ユ湡"
+ value-format="yyyy-MM-dd" style="width: 100%"> </el-date-picker>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="淇濊川鏈熻嚦" prop="HExpiryDate" width="120" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <el-date-picker v-model="scope.row.HExpiryDate" type="date" placeholder="閫夋嫨鏃ユ湡"
+ value-format="yyyy-MM-dd" style="width: 100%"> </el-date-picker>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鐑鐞�" prop="HheatNO" width="120" show-overflow-tooltip>
+ <template slot-scope="scope"><el-input v-model="scope.row.HheatNO" /></template>
+ </el-table-column>
+ <el-table-column align="center" label="杈呭姪灞炴�т唬鐮�" prop="HAuxPropNumber" width="120" show-overflow-tooltip>
+ <template slot-scope="scope"><el-input v-model="scope.row.HAuxPropNumber" /></template>
+ </el-table-column>
+ <el-table-column align="center" label="杈呭姪灞炴�у悕绉�" prop="HAuxPropName" width="120" show-overflow-tooltip>
+ <template slot-scope="scope">{{ scope.row.HAuxPropName }}</template>
+ </el-table-column>
+ <el-table-column align="center" label="璁￠噺鍗曚綅浠ｇ爜" prop="HUnitNumber" width="120" show-overflow-tooltip>
+ <template slot-scope="scope"><el-input v-model="scope.row.HUnitNumber" /></template>
+ </el-table-column>
+ <el-table-column align="center" label="璁￠噺鍗曚綅鍚嶇О" prop="HUnitName" width="120" show-overflow-tooltip>
+ <template slot-scope="scope">{{ scope.row.HUnitName }}</template>
+ </el-table-column>
+ <el-table-column align="center" label="杈呭崟浣嶆暟閲�" prop="HAuxQty" width="120" show-overflow-tooltip>
+ <template slot-scope="scope"><el-input v-model="scope.row.HAuxQty" /></template>
+ </el-table-column>
+ <el-table-column align="center" label="鏄惁鍚敤淇濊川鏈�" prop="HExpirationDateFlag" width="120" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <el-checkbox v-model="scope.row.HExpirationDateFlag"></el-checkbox>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鏄惁璧犲搧" prop="HGiveAwayFlag" width="120" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <el-checkbox v-model="scope.row.HGiveAwayFlag"></el-checkbox>
+ </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
@@ -172,6 +273,7 @@
<Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
<Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
<GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
+ <ScICMOBillList @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="ScICMOBillShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -186,11 +288,12 @@
import Material from '@/views/component/material'
import RowSettings from '@/views/component/rowSettings'
import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import ScICMOBillList from '@/views/ICMO/ScICMOBillList.vue'
import moment from 'moment';
export default {
name: 'Gy_BarCodeBill',
- components: { Dept, Warehouse, Material, RowSettings, GyEmployee },
+ components: { Dept, Warehouse, Material, RowSettings, GyEmployee, ScICMOBillList },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -201,6 +304,8 @@
data() {
return {
HModName: "Gy_BarCodeBill",
+ openNum: 10,
+ zbDataShow: true,
HSourceBillTypeList: [
{ value: 1, label: '鐢熶骇璁㈠崟', },
{ value: 2, label: '鐢熶骇姹囨姤鍗�', },
@@ -350,6 +455,7 @@
warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
materialShow: false,//鐗╂枡鏁版嵁缁勪欢
gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
+ ScICMOBillShow: false,
deptform: {},//寮圭獥閫変腑鏁版嵁
openData: false,//鏁版嵁寮圭獥
dialogTitle: '',
@@ -420,6 +526,61 @@
this.getdata()
},
methods: {
+ editMainTable(obj) {
+ console.log(obj)
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+ //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
+
+ switch (field) {
+ case "HQty": //鏁伴噺
+ value = isNaN(value) ? 0 : value;
+ var HMinQty = isNaN(data.HMinQty) ? 0 : data.HMinQty;
+ if (HMinQty == 0) {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: value, //鏁伴噺
+ HBQty: 0, //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
+ });
+ }
+ else {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: value, //鏁伴噺
+ HBQty: Math.ceil(value / HMinQty), //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
+ });
+ }
+ break;
+ case "HMinQty": //鏈�灏忓寘瑁呮暟閲�
+ value = isNaN(value) ? 0 : value;
+ HMinQty2 = value; //缁欐壒娆℃寜閽姛鑳戒腑鐨勬渶灏忓寘瑁呮暟璧嬪��
+ var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+ if (HQty == 0) //闄ゆ暟涓�0
+ {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMinQty: value, //鏈�灏忓寘瑁呮暟閲�
+ HBQty: 0, //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
+ });
+ }
+ else {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMinQty: value, //鏈�灏忓寘瑁呮暟閲�
+ HBQty: Math.ceil(HQty / value), //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
+ });
+ }
+
+ break;
+ default:
+ }
+ },
+ HSourceBillTypeChange(val) {
+ if (val == 1) {
+ this.openNum == 10
+ }
+ },
set_HBarCodeType() {
//鑾峰彇鏉＄爜绫诲瀷浠ｇ爜
axios.get(this.baseURL + '/Sc_BarCode/GetHBarCodeTypeBill').then(response => {
@@ -605,7 +766,7 @@
dbEmitData(deptRow, num) {
// num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
console.log(deptRow)
- if (deptRow.HItemID) {
+ if (deptRow.length > 0) {
if (num == 1) {
this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
this.form.HDeptID = deptRow.HItemID
@@ -633,9 +794,31 @@
this.form.HEmpID = deptRow.HItemID
this.gyEmployeeShow = false
this.openData = false
+ } else if (num == 10) {
+ this.zbDataShow = false
+ let data = deptRow
+ this.editWlxxData = deptRow
+ // for (var i = 0; i < data.length; i++) {
+ // this.editWlxxData.push({
+ // "HMaterID": data[i].HMaterID, "HMaterCode": "", "HMaterNumber": data[i].鐗╂枡浠ｇ爜, "HMaterName": data[i].鐗╂枡鍚嶇О
+ // , "HMaterModel": data[i].瑙勬牸鍨嬪彿, "HMaterSpec": "", "HBatchNo": data[i].鎵规, "HUnitID": data[i].HUnitID
+ // , "HUnitNumber": data[i].璁￠噺鍗曚綅浠ｇ爜, "HUnitName": data[i].璁￠噺鍗曚綅, "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0
+ // , "HQtyMust": 0, "HQty": data[i].鏁伴噺, "HBQty": 1, "HMinQty": data[i].鏁伴噺, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0
+ // , "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"]
+ // , "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "", "HAuxQty": 0, "HheatNO": "", "HProduceDate": moment(new Date()).format('YYYY-MM-DD')
+ // , "HExpiryDate": moment(new Date()).format('YYYY-MM-DD'), "HExpirationDateFlag": data[i].HISKFPERIOD == false ? 0 : 1
+ // , "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"]
+ // , "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": data[i].璁″垝璺熻釜鍙�, "HCusModel": "", "HCusMaterName": ""
+ // , "HCheckEmpName": ""
+ // })
+ // }
+ console.log(this.editWlxxData)
+ this.ScICMOBillShow = false
+ this.zbDataShow = true
+ this.openData = false
}
} else {
- this.$modal.msgError("璇烽�夋嫨鍗曟潯鏁版嵁!");
+ this.$modal.msgError("璇烽�夋嫨鏁版嵁!");
}
},
@@ -1019,6 +1202,7 @@
this.warehouseShow = false
this.materialShow = false
this.gyEmployeeShow = false
+ this.ScICMOBillShow = false
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
@@ -1043,6 +1227,10 @@
this.dialogTitle = '閿�鍞憳鍒楄〃'
this.gyEmployeeShow = true
this.openData = true
+ } else if (num == 10) {
+ this.dialogTitle = '鐢熶骇璁㈠崟鍒楄〃'
+ this.ScICMOBillShow = true
+ this.openData = true
}
},
}
--
Gitblit v1.9.1