From 1dcd80c233f47c2d325c6f150b40885d89bd01b5 Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期四, 04 十二月 2025 11:01:38 +0800
Subject: [PATCH] 器具模块部分接口修改
---
src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue | 53 +
src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue | 143 +++--
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue | 157 +++++-
src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue | 51 +
src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue | 111 ++-
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue | 23
src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue | 4
src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue | 115 +++-
src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue | 766 ++++++++++++++++++++++---------
9 files changed, 980 insertions(+), 443 deletions(-)
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
index 3253ada..3e4dbd2 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
@@ -46,12 +46,13 @@
<el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
<el-input v-model="queryParams.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" @keyup.enter.native="handleQuery" />
</el-form-item>
- <div slot="header" class="clearfix"><span>杩囨护</span></div>
+ <div slot="header" class="clearfix"><span>鍏朵粬鏉′欢</span></div>
<div>
<el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange">
<span v-for="(item, index) in btList" :key="index">
<el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
@@ -64,7 +65,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -74,7 +75,8 @@
<el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange">
<span v-for="(item, index) in btList" :key="index">
<el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
@@ -87,7 +89,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -96,7 +98,8 @@
</el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange">
<el-option v-for="(item, index) in btList" :key="index" :label="item.field"
:value="item.field"></el-option>
@@ -108,7 +111,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -393,7 +396,8 @@
"sWhere": this.sWhere,
"user": sessionStorage["HUserName"],
"page": this.page,
- "size": this.pageSize
+ "size": this.pageSize,
+ "Type": '3851'
},
}).then(response => {
this.tyResList = response.data.data//鎬绘暟鎹�
@@ -589,7 +593,7 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 2
- this.handleEdit()
+ this.handleEdit(row)
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -667,6 +671,22 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
+ if (this.queryParams.HStatus) {
+ switch (this.queryParams.HStatus) {
+ case '-1': //鍏ㄩ儴
+ this.sWhere += "";
+ break;
+ case '0': //鏈鏍�
+ this.sWhere += " and 瀹℃牳浜�=''";
+ break;
+ case '1': //宸插鏍�
+ this.sWhere += " and 瀹℃牳浜�<>''";
+ break;
+ case '2': //宸插叧闂�
+ this.sWhere += " and 鍏抽棴浜�<>''";
+ default:
+ }
+ }
if (this.sTime) {
this.sTime = moment(this.sTime).format('YYYY-MM-DD')
this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
@@ -687,6 +707,7 @@
if (this.queryParams.HSupName) {
this.sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
}
+ this.clearData()
this.getList()
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
@@ -712,6 +733,7 @@
}
this.riqiChange()
this.resetForm("queryForm")
+ this.clearData()
this.getList()
},
@@ -721,6 +743,7 @@
this.tableShow = true
this.openEdit = false
this.editShow = false
+ this.clearData()
this.getList()
},
//鎵撳紑鏂板缁勪欢寮圭獥
@@ -740,7 +763,16 @@
this.open = val
this.editShow = false
this.openEdit = val
+ this.clearData()
this.getList()
+ },
+ //娓呴櫎閫変腑鏁版嵁鐨勭紦瀛�
+ clearData(){
+ this.ids = []
+ this.multiple = true
+ this.single = true
+ this.OperationType = 0
+ this.copyType = 0
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
@@ -769,6 +801,7 @@
let result = response.data
if (result.count == 1) {
this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.clearData()
this.getList();
}
else {
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
index b98806c..b6c4171 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
@@ -3,7 +3,7 @@
<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(1, form)">瀹� 鏍�</el-button> -->
+ <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button>
<el-button type="primary" @click="close">閫� 鍑�</el-button>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
@@ -334,7 +334,7 @@
name: 'Sc_MouldMoveStockRequestBillEdit',
components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace },
props: {
- OperationType: { type: Number, },
+ OperationType: { type: Number, },//鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫銆�3澶嶅埗銆�4涓嬫帹锛�
linterid: { type: Number, },
HSouceBillType: { type: String, },
propsData: { type: String, },
@@ -862,6 +862,12 @@
, "HSCSPID": "0"
, "HSCSPNumber": ""
, "HSCSPName": ""
+ , "HSourceInterID": "0"
+ , "HSourceEntryID": "0"
+ , "HSourceBillType": ""
+ , "HSourceBillNo": ""
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
, "HRemark": ""
, "HPropertyID": "0"
, "HSecUnitID": "0"
@@ -882,11 +888,11 @@
, "HICMOInterID": "0"
, "HICMOEntryID": "0"
, "HICMOBillNo": ""
- , "HSTOCKORGID": "0"
- , "HOWNERID": "0"
+ , "HSTOCKORGID": this.form.HStockOutOrgID
+ , "HOWNERID": this.form.HStockOutOrgID
, "HOWNERTYPEID": ""
- , "HSTOCKORGINID": "0"
- , "HOWNERINID": "0"
+ , "HSTOCKORGINID": this.form.HStockInOrgID
+ , "HOWNERINID": this.form.HStockInOrgID
, "HOWNERTYPEINID": ""
, "HBASEUNITID": "0"
, "HEXTAUXUNITID": "0"
@@ -1021,12 +1027,13 @@
set_CheckBill(num, form) {
var InterID = form.hmainid || form.HInterID
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.baseURL + "/Sc_MouldProdMoveBill/AuditMouldProdMoveBill", {
- params: { "HInterID": InterID, "flag": num, "user": sessionStorage["HUserName"] }
+ axios.get(this.baseURL + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Check_Json", {
+ params: { "HInterID": InterID, "Type": num, "HMaker": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
if (result.code == 1) {
this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.close()
}
else {
this.$modal.msgError("閿欒:" + result.code + result.Message,);
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
index 57240f3..6a3b616 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
@@ -1,5 +1,5 @@
<template>
- <div style="padding: 10px;">
+ <div style="padding: 10px; position: relative;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
<el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px;">
<el-date-picker v-model="sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px;">
@@ -46,12 +46,13 @@
<el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
<el-input v-model="queryParams.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" @keyup.enter.native="handleQuery" />
</el-form-item>
- <div slot="header" class="clearfix"><span>杩囨护</span></div>
+ <div slot="header" class="clearfix"><span>鍏朵粬鏉′欢</span></div>
<div>
<el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange">
<span v-for="(item, index) in btList" :key="index">
<el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
@@ -64,7 +65,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -74,7 +75,8 @@
<el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange">
<span v-for="(item, index) in btList" :key="index">
<el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
@@ -87,7 +89,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -96,7 +98,8 @@
</el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange">
<el-option v-for="(item, index) in btList" :key="index" :label="item.field"
:value="item.field"></el-option>
@@ -108,7 +111,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -131,6 +134,10 @@
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
@click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-tickets" size="mini" :disabled="single"
+ @click="handleMove(row = rowForm, OperationType = 4)">涓嬫帹锛堝櫒鍏风洿鎺ヨ皟鎷ㄥ崟锛�</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
@@ -169,9 +176,7 @@
<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 = 2)"
- v-else-if="column.property == '鍗曟嵁鍙�'">{{
- row.鍗曟嵁鍙�
- }}</el-button>
+ v-else-if="column.property == '鍗曟嵁鍙�'">{{row.鍗曟嵁鍙穧}</el-button>
<span v-else>{{ row[column.label] }}</span>
</div>
</template>
@@ -188,6 +193,11 @@
<edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
:copyType="copyType" @editClose="editClose" v-if="editShow" />
</el-dialog>
+ <!-- 涓嬫帹 -->
+ <el-dialog title="涓嬫帹鍣ㄥ叿鐩存帴璋冩嫧鍗�" :visible.sync="openMove" width="1480px" append-to-body class="xsckdBox" @close="close">
+ <move :OperationType='4' :propsData='moveData' :HSouceBillType=BillType
+ @editClose="moveClose" v-if="moveShow" />
+ </el-dialog>
<el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
<PrintList :linterid=this.rowForm.hmainid :MyMsg=this.rowForm.hmainid :Type='HModName'
:HModName='HModName' @rowEditClose="rowSetClose" v-if="printListShow" />
@@ -201,18 +211,27 @@
import axios from 'axios'
import RowSettings from '@/views/component/rowSettings'
import Edit from '@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit'
+import Move from '@/views/scMould/warehouse/Sc_MouldProdMoveBillEdit'
import PrintList from '@/views/component/printList'
import moment from 'moment';
export default {
name: 'Sc_MouldMoveStockRequestBillList',
- components: { RowSettings, Edit, PrintList },
+ components: { RowSettings, Edit, Move,PrintList },
+ props: {
+ openPage: { type: String, },
+ HOrgID: { type: String, },
+ },
data() {
return {
HModName: "Sc_MouldMoveStockRequestBillList",
+ rowList:[],
activeSeach: '',
editShow: false,
openEdit: false,
+ moveShow: false,
+ openMove: false,
+ moveData:'',
totalNameList: [],
tableShow: true,
openPrintList: false,
@@ -301,10 +320,14 @@
page: 1,
pageSize: 0,
total: 0,
+ BillType:'3850',
};
},
created() {
// this.fetchData()
+ if(this.openPage && this.HOrgID){
+ this.queryParams.HStockOutOrgID = this.HOrgID
+ }
this.riqiChange()
this.getList();
},
@@ -379,13 +402,14 @@
if (this.pageSize == 0) {
this.pageSize = 50
}
- // 閿�鍞嚭搴撳崟鍒楄〃
+ // 鍒楄〃
axios.get(this.baseURL + '/Sc_MouldMoveStockRequestBillController/page', {
params: {
"sWhere": this.sWhere,
"user": sessionStorage["HUserName"],
"page": this.page,
- "size": this.pageSize
+ "size": this.pageSize,
+ "Type": this.BillType,
},
}).then(response => {
this.tyResList = response.data.data//鎬绘暟鎹�
@@ -571,22 +595,26 @@
this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
+ if (this.openPage) {
+ this.$emit('deptEmit', this.rowList, this.BillType)
+ }
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
- if (this.ids.includes(row.hmainid)) {
+ if (this.ids.includes(row.sorderid)) {
return { "background": "#ecf5ff" }
}
},
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 2
- this.handleEdit()
+ this.handleEdit(row);
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
- this.ids = selection.map(item => item.hmainid)
+ this.rowList=selection
+ this.ids = selection.map(item => item.sorderid)
this.single = selection.length != 1
this.multiple = !selection.length
if (!this.single) {
@@ -659,6 +687,22 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
+ if (this.queryParams.HStatus) {
+ switch (this.queryParams.HStatus) {
+ case '-1': //鍏ㄩ儴
+ this.sWhere += "";
+ break;
+ case '0': //鏈鏍�
+ this.sWhere += " and 瀹℃牳浜�=''";
+ break;
+ case '1': //宸插鏍�
+ this.sWhere += " and 瀹℃牳浜�<>''";
+ break;
+ case '2': //宸插叧闂�
+ this.sWhere += " and 鍏抽棴浜�<>''";
+ default:
+ }
+ }
if (this.sTime) {
this.sTime = moment(this.sTime).format('YYYY-MM-DD')
this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
@@ -674,11 +718,12 @@
this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
}
if (this.queryParams.HModelNumber) {
- this.sWhere += " and 妯″叿浠ｇ爜 like '%" + this.queryParams.HModelNumber + "%'";
+ this.sWhere += " and 鍣ㄥ叿浠ｇ爜 like '%" + this.queryParams.HModelNumber + "%'";
}
if (this.queryParams.HSupName) {
this.sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
}
+ this.clearData()
this.getList()
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
@@ -702,6 +747,7 @@
ColContent2: '',
ColContent: '',
}
+ this.clearData()
this.riqiChange()
this.resetForm("queryForm")
this.getList()
@@ -713,6 +759,7 @@
this.tableShow = true
this.openEdit = false
this.editShow = false
+ this.clearData()
this.getList()
},
//鎵撳紑鏂板缁勪欢寮圭獥
@@ -727,12 +774,69 @@
this.editShow = true
this.openEdit = true
},
+ //鎵撳紑涓嬫帹缁勪欢寮圭獥
+ handleMove() {
+ if (this.rowList.length > 0) {
+ var dataArray = [];
+ var HSupTypeID_Temp = this.rowList[0].HSupTypeID
+ var HStockInOrgID_Temp = this.rowList[0].HSTOCKORGINID
+ for (var i = 0; i < this.rowList.length; i++) {
+ if (this.rowList[i].鍗曟嵁鐘舵�� != "宸插鏍�") {
+ this.$modal.msgSuccess("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戜笉涓哄凡瀹℃牳鐘舵��,涓嶅厑璁镐笅鎺紒")
+ return;
+ }
+ if (this.rowList[i].HQtyMust <= 0) {
+ this.$modal.msgSuccess("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戝搴斿彲涓嬫帹鏁伴噺蹇呴』澶т簬 0 锛�")
+ return;
+ }
+ if (this.rowList[i].HSupTypeID != HSupTypeID_Temp) {
+ this.$modal.msgSuccess("涓嬫帹澶辫触锛佹墍閫夊崟鎹搴斿線鏉ョ被鍨嬪繀椤讳竴鑷达紒")
+ return;
+ }
+ if (this.rowList[i].HSTOCKORGINID != HStockInOrgID_Temp) {
+ this.$modal.msgSuccess("涓嬫帹澶辫触锛佹墍閫夊崟鎹搴旇皟鍏ョ粍缁囧繀椤讳竴鑷达紒")
+ return;
+ }
+ var temp = {
+ "hmainid": this.rowList[i].hmainid
+ , "hsubid": this.rowList[i].hsubid
+ , "HBillType": this.rowList[i].HBillType
+ }
+ dataArray.push(temp);
+ }
+ var datajson = {
+ "data": dataArray
+ };
+ this.moveData = JSON.stringify(datajson)
+ this.moveShow = true
+ this.openMove = true
+ } else {
+ layer.msg('璇烽�夋嫨鏁版嵁涓嬫帹锛�');
+ }
+ },
//鍏抽棴缂栬緫椤甸潰
editClose(val) {
this.open = val
this.editShow = false
this.openEdit = val
+ this.clearData()
this.getList()
+ },
+ //鍏抽棴涓嬫帹椤甸潰
+ moveClose(val) {
+ this.open = val
+ this.editShow = false
+ this.openEdit = val
+ this.clearData()
+ this.getList()
+ },
+ //娓呴櫎閫変腑鏁版嵁鐨勭紦瀛�
+ clearData(){
+ this.ids = []
+ this.multiple = true
+ this.single = true
+ this.OperationType = 0
+ this.copyType = 0
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
@@ -761,6 +865,7 @@
let result = response.data
if (result.count == 1) {
this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.clearData()
this.getList();
}
else {
@@ -802,22 +907,6 @@
}
// var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
- },
-
- //#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
- defaintOperationByCompanyName() {
- var result = false;
- axios.get(this.baseURL + '/Xt_getInfo/getCompanyName').then(response => {
- var data1 = response.data
- if (data1.count == 1) {
- if (data1.data == "姘村姟") {
- result = true;
- }
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- return result;
},
}
};
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
index 000d1b8..c0154ae 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
@@ -96,14 +96,14 @@
<el-row>
<el-col :span="6">
<el-form-item label="婧愬崟绫诲瀷" prop="HSourceBillType">
- <el-select v-model="form.HSourceBillType" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+ <el-select v-model="form.HSourceBillType" placeholder="璇烽�夋嫨">
<el-option v-for="(item, index) in HSourceBillTypes" :key="index" :label="item.HSourceBillTypeName" :value="item.HSourceBillType">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="婧愬崟鍗曞彿" prop="HRemark">
+ <el-form-item label="婧愬崟鍗曞彿" prop="HSourceBillNo">
<el-input placeholder="璇烽�夋嫨婧愬崟鍗曞彿" disabled>
<el-button slot="append" icon="el-icon-search" @click="get_checkMainSource()"></el-button>
</el-input>
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
index a326bae..f84ab8f 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
@@ -46,12 +46,13 @@
<el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
<el-input v-model="queryParams.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" @keyup.enter.native="handleQuery" />
</el-form-item>
- <div slot="header" class="clearfix"><span>杩囨护</span></div>
+ <div slot="header" class="clearfix"><span>鍏朵粬鏉′欢</span></div>
<div>
<el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange">
<span v-for="(item, index) in btList" :key="index">
<el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
@@ -64,7 +65,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -74,7 +75,8 @@
<el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange">
<span v-for="(item, index) in btList" :key="index">
<el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
@@ -87,7 +89,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -96,7 +98,8 @@
</el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange">
<el-option v-for="(item, index) in btList" :key="index" :label="item.field"
:value="item.field"></el-option>
@@ -108,7 +111,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -393,7 +396,8 @@
"sWhere": this.sWhere,
"user": sessionStorage["HUserName"],
"page": this.page,
- "size": this.pageSize
+ "size": this.pageSize,
+ "Type":"3849",
},
}).then(response => {
this.tyResList = response.data.data//鎬绘暟鎹�
@@ -589,7 +593,7 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 2
- this.handleEdit()
+ this.handleEdit(row)
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -667,6 +671,22 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
+ if (this.queryParams.HStatus) {
+ switch (this.queryParams.HStatus) {
+ case '-1': //鍏ㄩ儴
+ this.sWhere += "";
+ break;
+ case '0': //鏈鏍�
+ this.sWhere += " and 瀹℃牳浜�=''";
+ break;
+ case '1': //宸插鏍�
+ this.sWhere += " and 瀹℃牳浜�<>''";
+ break;
+ case '2': //宸插叧闂�
+ this.sWhere += " and 鍏抽棴浜�<>''";
+ default:
+ }
+ }
if (this.sTime) {
this.sTime = moment(this.sTime).format('YYYY-MM-DD')
this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
@@ -682,11 +702,12 @@
this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
}
if (this.queryParams.HModelNumber) {
- this.sWhere += " and 妯″叿浠ｇ爜 like '%" + this.queryParams.HModelNumber + "%'";
+ this.sWhere += " and 鍣ㄥ叿浠ｇ爜 like '%" + this.queryParams.HModelNumber + "%'";
}
if (this.queryParams.HSupName) {
this.sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
}
+ this.clearData()
this.getList()
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
@@ -712,6 +733,7 @@
}
this.riqiChange()
this.resetForm("queryForm")
+ this.clearData()
this.getList()
},
@@ -721,6 +743,7 @@
this.tableShow = true
this.openEdit = false
this.editShow = false
+ this.clearData()
this.getList()
},
//鎵撳紑鏂板缁勪欢寮圭獥
@@ -740,7 +763,16 @@
this.open = val
this.editShow = false
this.openEdit = val
+ this.clearData()
this.getList()
+ },
+ //娓呴櫎閫変腑鏁版嵁鐨勭紦瀛�
+ clearData(){
+ this.ids = []
+ this.multiple = true
+ this.single = true
+ this.OperationType = 0
+ this.copyType = 0
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
@@ -769,6 +801,7 @@
let result = response.data
if (result.count == 1) {
this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.clearData()
this.getList();
}
else {
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
index 3694c0e..c1b4540 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
@@ -25,36 +25,34 @@
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
<el-card class="box-card">
- <el-form-item label="缁勭粐鍚嶇О" prop="HStockOrgName">
- <el-input v-model="queryParams.HStockOrgName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keyup.enter.native="handleQuery" />
+ <el-form-item label="鐘舵��" prop="HStatus">
+ <el-select v-model="queryParams.HStatus" placeholder="璇烽�夋嫨鐘舵��">
+ <el-option v-for="(item, index) in HStatusList" :key="index" :label="item.name" :value="item.value">
+ </el-option>
+ </el-select>
</el-form-item>
- <!-- <el-form-item label="缁勭粐">
- <el-select v-model="queryParams.HOrgID" placeholder="璇烽�夋嫨">
+ <el-form-item label="缁勭粐">
+ <el-select v-model="queryParams.HStockOrgID" placeholder="璇烽�夋嫨">
<el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
- </el-form-item> -->
+ </el-form-item>
<el-form-item label="閮ㄩ棬淇℃伅" prop="HDept">
<el-input v-model="queryParams.HDept" placeholder="璇疯緭鍏ラ儴闂ㄤ俊鎭�" @keyup.enter.native="handleQuery" />
- </el-form-item>
- <el-form-item label="鐗╂枡浠ｇ爜" prop="HMaterNumber">
- <el-input v-model="queryParams.HMaterNumber" placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="鍣ㄥ叿浠ｇ爜" prop="HModelNumber">
<el-input v-model="queryParams.HModelNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�" @keyup.enter.native="handleQuery" />
</el-form-item>
- <el-form-item label="浠撳簱" prop="HWhName">
- <el-input v-model="queryParams.HWhName" placeholder="璇疯緭鍏ヤ粨搴�" @keyup.enter.native="handleQuery" />
- </el-form-item>
<el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
<el-input v-model="queryParams.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" @keyup.enter.native="handleQuery" />
</el-form-item>
- <div slot="header" class="clearfix"><span>杩囨护</span></div>
+ <div slot="header" class="clearfix"><span>鍏朵粬鏉′欢</span></div>
<div>
<el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange">
<span v-for="(item, index) in btList" :key="index">
<el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
@@ -67,7 +65,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -77,7 +75,8 @@
<el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange">
<span v-for="(item, index) in btList" :key="index">
<el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
@@ -90,7 +89,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -99,7 +98,8 @@
</el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange">
<el-option v-for="(item, index) in btList" :key="index" :label="item.field"
:value="item.field"></el-option>
@@ -111,7 +111,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -253,7 +253,7 @@
{ label: '杩戜竴骞�', value: 365 },
],
organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
- hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
+ HStatusList: [{name:'鍏ㄩ儴',value:'-1'},{name:'鏈鏍�',value:'0'},{name:'宸插鏍�',value:'1'},{name:'宸插叧闂�',value:'2'}],
addBtnShow: false,
dialogTitle: '',
OperationType: null,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
@@ -271,11 +271,10 @@
queryParams: {
HBillNo: '',
HInitTimeCycle: 29,
- HStockOrgName: '',
+ HStockOrgID: sessionStorage["OrganizationID"] - 0,
+ HStatus:'-1',
HDept:'',
- HMaterNumber: '',
HModelNumber:'',
- HWhName:'',
HSupName:'',
ColName1: '',
ColName2: '',
@@ -374,20 +373,24 @@
this.tableShow = false
this.loading = true
if (this.sTime && !this.sWhere) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'"
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'"
+ this.sTime = moment(this.sTime).format('YYYY-MM-DD')
+ this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+ this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
+ this.sWhere += " and 鏃ユ湡 <= '" + this.eTime + "'";
}
+ this.sWhere += " and HSTOCKORGID=" + this.queryParams.HStockOrgID
if (this.pageSize == 0) {
this.pageSize = 50
}
// 閿�鍞嚭搴撳崟鍒楄〃
- axios.get(this.baseURL + '/Sc_MouldProdBackBill/list_byPage', {
+ axios.get(this.baseURL + '/Sc_MouldProdBackBillController/page', {
params: {
"sWhere": this.sWhere,
"user": sessionStorage["HUserName"],
"Organization": sessionStorage["Organization"],
"page": this.page,
- "size": this.pageSize
+ "size": this.pageSize,
+ "Type": '3803'
},
}).then(response => {
this.tyResList = response.data.data//鎬绘暟鎹�
@@ -583,7 +586,7 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 3
- this.handleEdit()
+ this.handleEdit(row)
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -661,34 +664,43 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
+ if (this.queryParams.HStatus) {
+ switch (this.queryParams.HStatus) {
+ case '-1': //鍏ㄩ儴
+ this.sWhere += "";
+ break;
+ case '0': //鏈鏍�
+ this.sWhere += " and 瀹℃牳浜�=''";
+ break;
+ case '1': //宸插鏍�
+ this.sWhere += " and 瀹℃牳浜�<>''";
+ break;
+ case '2': //宸插叧闂�
+ this.sWhere += " and 鍏抽棴浜�<>''";
+ default:
+ }
+ }
if (this.sTime) {
this.sTime = moment(this.sTime).format('YYYY-MM-DD')
- this.eTime = moment(this.eTime).format('YYYY-MM-DD')
- console.log(this.sTime, this.eTime)
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'" + " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
+ this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
}
-
+ if (this.eTime) {
+ this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+ this.sWhere += " and 鏃ユ湡 <= '" + this.eTime + "'";
+ }
if (this.queryParams.HBillNo) {
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
- }
- if (this.queryParams.HStockOrgName) {
- this.sWhere += " and 缁勭粐鍚嶇О like '%" + this.queryParams.HStockOrgName + "%'";
}
if (this.queryParams.HDept) {
this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
}
- if (this.queryParams.HMaterNumber) {
- this.sWhere += " and 鐗╂枡浠ｇ爜 like '%" + this.queryParams.HMaterNumber + "%'";
- }
if (this.queryParams.HModelNumber) {
- this.sWhere += " and 妯″叿浠ｇ爜 like '%" + this.queryParams.HModelNumber + "%'";
- }
- if (this.queryParams.HWhName) {
- this.sWhere += " and 浠撳簱 like '%" + this.queryParams.HWhName + "%'";
+ this.sWhere += " and 鍣ㄥ叿浠ｇ爜 like '%" + this.queryParams.HModelNumber + "%'";
}
if (this.queryParams.HSupName) {
this.sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
}
+ this.clearData()
this.getList()
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
@@ -697,11 +709,10 @@
this.queryParams = {
HBillNo: '',
HInitTimeCycle: 29,
- HStockOrgName: '',
+ HStockOrgID: sessionStorage["OrganizationID"] - 0,
+ HStatus:'-1',
HDept:'',
- HMaterNumber: '',
HModelNumber:'',
- HWhName:'',
HSupName:'',
ColName1: '',
ColName2: '',
@@ -715,6 +726,7 @@
}
this.riqiChange()
this.resetForm("queryForm")
+ this.clearData()
this.getList()
},
@@ -724,6 +736,7 @@
this.tableShow = true
this.openEdit = false
this.editShow = false
+ this.clearData()
this.getList()
},
//鎵撳紑鏂板缁勪欢寮圭獥
@@ -743,7 +756,16 @@
this.open = val
this.editShow = false
this.openEdit = val
+ this.clearData()
this.getList()
+ },
+ //娓呴櫎閫変腑鏁版嵁鐨勭紦瀛�
+ clearData(){
+ this.ids = []
+ this.multiple = true
+ this.single = true
+ this.OperationType = 0
+ this.copyType = 0
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
@@ -772,6 +794,7 @@
let result = response.data
if (result.count == 1) {
this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.clearData()
this.getList();
}
else {
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
index 2f35de3..372db09 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
@@ -23,59 +23,112 @@
</el-date-picker>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="璋冨叆缁勭粐" prop="HStockInOrgID">
+ <el-select v-model="form.HStockInOrgID" placeholder="璇烽�夋嫨缁勭粐" :disabled="ifOrganizationEdit">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
<el-col :span="6">
- <el-form-item label="鍐呴儴鍗曟嵁鍙�" prop="HInnerBillNo">
- <el-input v-model="form.HInnerBillNo" placeholder="璇疯緭鍏ュ唴閮ㄥ崟鎹彿" />
+ <el-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
+ <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+ <el-option v-for="(item, index) in hSupTypeList" :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="HWHName">
- <el-input v-model="form.HWHName" placeholder="璇烽�夋嫨鍣ㄥ叿浠撳簱" disabled>
+ <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
+ <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨寰�鏉ュ崟浣�" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="璋冨嚭缁勭粐" prop="HStockOutOrgID">
+ <el-select v-model="form.HStockOutOrgID" placeholder="璇烽�夋嫨缁勭粐" :disabled="ifOrganizationEdit">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="閮ㄩ棬" prop="HDeptName">
+ <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1,deptType=1)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="璋冨叆浠撳簱" prop="HWHName">
+ <el-input v-model="form.HWHName" placeholder="璇烽�夋嫨璋冨叆浠撳簱" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialog(2,eHWHType=1)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="璋冨嚭浠撳簱" prop="HSCWHName">
+ <el-input v-model="form.HSCWHName" placeholder="璇烽�夋嫨璋冨嚭浠撳簱" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2,eHWHType=2)"></el-button>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="棰嗘枡浜�" prop="HSecManagerName">
- <el-input v-model="form.HSecManagerName" placeholder="璇烽�夋嫨棰嗘枡浜�" disabled>
+ <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,empType=1)"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍙戞枡浜�" prop="HKeeperName">
- <el-input v-model="form.HKeeperName" placeholder="璇烽�夋嫨鍙戞枡浜�" disabled>
+ <el-form-item label="璐熻矗浜�" prop="HMangerName">
+ <el-input v-model="form.HMangerName" placeholder="璇烽�夋嫨" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=2)"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="閮ㄩ棬" prop="HDeptName">
- <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
+ <el-form-item label="楠屾敹鍛�" prop="HSecManagerName">
+ <el-input v-model="form.HSecManagerName" placeholder="璇烽�夋嫨" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=3)"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="淇濈鍛�" prop="HKeeperName">
+ <el-input v-model="form.HKeeperName" placeholder="璇烽�夋嫨" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=4)"></el-button>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="璋冩嫧绫诲瀷" prop="HStockStyle">
- <el-select v-model="form.HStockStyle" placeholder="璇烽�夋嫨">
- <el-option label="鍚岀粍缁囪皟鎷�" value="鍚岀粍缁囪皟鎷�" />
- <el-option label="璺ㄧ粍缁囪皟鎷�" value="璺ㄧ粍缁囪皟鎷�" />
+ <el-form-item label="婧愬崟绫诲瀷" prop="HSourceBillType">
+ <el-select v-model="form.HSourceBillType" placeholder="璇烽�夋嫨">
+ <el-option v-for="(item, index) in HSourceBillTypes" :key="index" :label="item.HSourceBillTypeName" :value="item.HSourceBillType">
+ </el-option>
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="6">
- <el-form-item label="缁勭粐" prop="HOrgID">
- <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" :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 label="婧愬崟鍗曞彿" prop="HSourceBillNo">
+ <el-input placeholder="璇烽�夋嫨婧愬崟鍗曞彿" disabled>
+ <el-button slot="append" icon="el-icon-search" @click="get_checkMainSource()"></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍐呴儴鍗曟嵁鍙�" prop="HInnerBillNo">
+ <el-input v-model="form.HInnerBillNo" placeholder="璇疯緭鍏�" />
</el-form-item>
</el-col>
</el-row>
@@ -177,7 +230,7 @@
<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.HMaterCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(8, scope.row)"
+ <el-input v-model="scope.row.HMaterNumber" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(8, scope.row)"
@dblclick.native="openDataDialog(8, scope.row)" />
</template>
</el-table-column>
@@ -188,37 +241,17 @@
</el-table-column>
<el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.HMaterSpec }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="鎵规" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.HBatchNo" placeholder="璇疯緭鍏�" />
+ <span>{{ scope.row.HMaterModel }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="璁￠噺鍗曚綅浠ｇ爜" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.HUnitCode }}</span>
+ <span>{{ scope.row.HUnitNumber }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HUnitName }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="璁捐瀵垮懡" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.HDesignLife" placeholder="璇疯緭鍏�" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="鍓╀綑瀵垮懡" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.HLeaveLife" placeholder="璇疯緭鍏�" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="绱浣跨敤瀵垮懡" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.HUseLife" placeholder="璇疯緭鍏�" />
</template>
</el-table-column>
<el-table-column align="center" label="搴斿彂鏁伴噺" width="120">
@@ -232,34 +265,10 @@
controls-position="right"></el-input-number>
</template>
</el-table-column>
- <el-table-column align="center" label="鍗曚环" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.HPrice" placeholder="璇疯緭鍏�" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="閲戦" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.HMoney" placeholder="璇疯緭鍏�" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="璋冨叆缁勭粐浠ｇ爜" width="120">
- <template slot-scope="scope">
- <!-- <el-select v-model="scope.row.HStockOrgCode" placeholder="璇烽�夋嫨缁勭粐" @change="HStockOrgChange(zbIndex = scope.row.index - 1)">
- <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID"></el-option>>
- </el-option>
- </el-select> -->
- <span>{{ scope.row.HStockOrgCode }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="璋冨叆缁勭粐" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HStockOrgName }}</span>
- </template>
- </el-table-column>
<el-table-column align="center" label="璋冨叆浠撳簱浠ｇ爜" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.HWHCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=2)"
- @dblclick.native="openDataDialog(2, scope.row ,eHWHType=2)" />
+ <el-input v-model="scope.row.HWHNumber" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=3)"
+ @dblclick.native="openDataDialog(2, scope.row ,eHWHType=3)" />
</template>
</el-table-column>
<el-table-column align="center" label="璋冨叆浠撳簱" width="120">
@@ -269,7 +278,7 @@
</el-table-column>
<el-table-column align="center" label="璋冨叆浠撲綅浠ｇ爜" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.HSPCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row,HSPType=1)"
+ <el-input v-model="scope.row.HSPNumber" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row,HSPType=1)"
@dblclick.native="openDataDialog(9, scope.row,HSPType=1)" />
</template>
</el-table-column>
@@ -280,8 +289,8 @@
</el-table-column>
<el-table-column align="center" label="璋冨嚭浠撳簱浠ｇ爜" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.HSCWHCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=3)"
- @dblclick.native="openDataDialog(2, scope.row ,eHWHType=3)" />
+ <el-input v-model="scope.row.HSCWHNumber" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=4)"
+ @dblclick.native="openDataDialog(2, scope.row ,eHWHType=4)" />
</template>
</el-table-column>
<el-table-column align="center" label="璋冨嚭浠撳簱" width="120">
@@ -291,7 +300,7 @@
</el-table-column>
<el-table-column align="center" label="璋冨嚭浠撲綅浠ｇ爜" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.HSCSPCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row,HSPType=2)"
+ <el-input v-model="scope.row.HSCSPNumber" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row,HSPType=2)"
@dblclick.native="openDataDialog(9, scope.row,HSPType=2)" />
</template>
</el-table-column>
@@ -377,6 +386,7 @@
<GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
<GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
<GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
+ <ScMouldMove @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :HOrgID="form.HStockOutOrgID" v-if="scMouldMoveShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -398,13 +408,14 @@
import GyCustomer from '@/views/GyCustomer'
import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
+import ScMouldMove from '@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue'
import moment from 'moment';
export default {
name: 'Sc_MouldProdMoveBillEdit',
- components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace },
+ components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ScMouldMove },
props: {
- OperationType: { type: Number, },
+ OperationType: { type: Number, },//锛�1鏂板銆�2缂栬緫銆�3澶嶅埗銆�4涓嬫帹锛�
linterid: { type: Number, },
HSouceBillType: { type: String, },
propsData: { type: String, },
@@ -419,6 +430,8 @@
zzSelDis: false,
rowHideShow: false,
openRowHide: false,
+ hSupTypeList: [{name:'渚涘簲鍟�',id:1,},{name:'瀹㈡埛',id:2},{name:'杞﹂棿閮ㄩ棬',id:3}],
+ HSourceBillTypes:[],
addBtnShow: false,
zbIndex: null,
zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
@@ -430,15 +443,18 @@
gyCustomerShow: false,//瀹㈡埛鏁版嵁缁勪欢
gyMouldShow: false,//鍣ㄥ叿鏁版嵁缁勪欢
gyStockPlaceShow: false,//浠撲綅鏁版嵁缁勪欢
+ scMouldMoveShow:false,//婧愬崟缁勪欢
eHWHType:1,//浠撳簱寮圭獥鍖哄垎鏍囧織
empType:1,//鑱屽憳寮圭獥鍖哄垎鏍囧織
HSPType:1,//浠撲綅寮圭獥鍖哄垎鏍囧織
+ deptType:1,//閮ㄩ棬寮圭獥鍖哄垎鏍囧織
deptform: {},//寮圭獥閫変腑鏁版嵁
openData: false,//鏁版嵁寮圭獥
dialogTitle: '',
organizationList: [],//缁勭粐鍒楄〃
+ ifOrganizationEdit: false,
subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
- // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+ // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛�1鏂板銆�2缂栬緫銆�3澶嶅埗銆�4涓嬫帹锛�
HInterID: 0,
baseURL: process.env.VUE_APP_BASE_API,
checkedSysZb: [],
@@ -486,26 +502,30 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
+ HBillNo: [
+ { required: true, message: "鍗曟嵁鍙蜂笉鑳戒负绌�", trigger: "blur" }
+ ],
HDate: [
{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
],
- HWHName: [
- { required: true, message: "鍣ㄥ叿浠撳簱涓嶈兘涓虹┖", trigger: "blur" }
+ HStockInOrgID: [
+ { required: true, message: "璋冨叆缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HStockOutOrgID: [
+ { required: true, message: "璋冨嚭缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
],
HSecManagerName: [
- { required: true, message: "棰嗘枡浜轰笉鑳戒负绌�", trigger: "blur" }
+ { required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }
],
HKeeperName: [
- { required: true, message: "鍙戞枡浜轰笉鑳戒负绌�", trigger: "blur" }
- ],
- HDeptName: [
- { required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }
+ { required: true, message: "淇濈鍛樹笉鑳戒负绌�", trigger: "blur" }
]
}
};
},
created() {
this.fetchData()
+ this.SourceBillType()
this.getdata()
},
methods: {
@@ -519,14 +539,29 @@
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
+ SourceBillType(){
+ axios.get(this.baseURL + "/Web/GetHSourceBillType", {
+ params: { "HName": '鍣ㄥ叿璋冩嫧鍗�', "Num": 2 }//0钃濆崟 1绾㈠崟 2涓嶅垎绾㈣摑鍗�
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.HSourceBillTypes = response.data.data
+ this.form.HSourceBillType = this.HSourceBillTypes[0].HSourceBillType
+ this.form.HSourceBillTypeName = this.HSourceBillTypes[0].HSourceBillTypeName
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
getdata() {
console.log(this.copyType, this.OperationType)
this.formShow = false
this.formLoading = true
if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
this.handleAdd()
- } else if (this.OperationType == 3 || this.copyType == 1) {
+ } else if (this.OperationType == 2 || this.copyType == 1) {
this.handleUpdate()
+ } else if (this.OperationType == 4) {
+ this.handleMove()
}
},
// 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
@@ -553,70 +588,235 @@
// let options=undefined
// this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
},
+ //鑾峰彇婧愬崟鏁版嵁
+ GetSourceBillList(HSourceInterID, HSourceEntryID, HSourceBillType) {
+ var res = "none"
+ axios.get(this.baseURL + "/Sc_MouldProdMoveBillController/GetSourceBill_MouldProdMove_Json", {
+ params: { "HInterID": HSourceInterID, "HEntryID": HSourceEntryID, "HBillType": HSourceBillType }
+ }).then(response => {
+ if (response.data.count == 1) {
+ res = response.data.data[0]
+ }else {
+ res = "none";
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ return res;
+ },
+ //鍐欏叆婧愬崟鏁版嵁
+ setInitBySourceBill(dataArray){
+ var data = dataArray[0]
+ this.form.HSupTypeID = data.HSupTypeID
+ this.form.HSupID = data.HSupID
+ this.form.HSupName = data.HSupName
+ this.form.HDeptID = data.HDeptID
+ this.form.HDeptName = data.HDeptName
+ this.form.HStockInOrgID = data.HStockInOrgID
+ this.form.HStockOutOrgID = data.HStockOutOrgID
+ this.form.HStockOrgID = data.HStockOutOrgID
+ this.form.HStockInOrgID = data.HStockInOrgID == null ? 0 : data.HStockInOrgID
+ this.form.HStockOutOrgID = data.HStockOutOrgID == null ? 0 : data.HStockOutOrgID
+ this.ifOrganizationEdit = true
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (let i = 0; i < dataArray.length; i++) {
+ rowdata.push(
+ {
+ "HMaterID": dataArray[i].HMaterID == null ? 0 : dataArray[i].HMaterID
+ , "HMaterNumber": dataArray[i].HMaterNumber == null ? "" : dataArray[i].HMaterNumber
+ , "HMaterName": dataArray[i].HMaterName == null ? "" : dataArray[i].HMaterName
+ , "HMaterModel": dataArray[i].HMaterModel == null ? "" : dataArray[i].HMaterModel
+ , "HUnitID": dataArray[i].HUnitID == null ? 0 : dataArray[i].HUnitID
+ , "HUnitNumber": dataArray[i].HUnitNumber == null ? "" : dataArray[i].HUnitNumber
+ , "HUnitName": dataArray[i].HUnitName == null ? "" : dataArray[i].HUnitName
+ , "HBatchNo": ""
+ , "HQty": dataArray[i].HQty == null ? 0 : dataArray[i].HQty
+ , "HWHID": dataArray[i].HWHID == null ? 0 : dataArray[i].HWHID
+ , "HWHNumber": dataArray[i].HWHNumber == null ? "" : dataArray[i].HWHNumber
+ , "HWHName": dataArray[i].HWHName == null ? "" : dataArray[i].HWHName
+ , "HSPID": "0"
+ , "HSPNumber": ""
+ , "HSPName": ""
+ , "HSCWHID": dataArray[i].HSCWHID == null ? 0 : dataArray[i].HSCWHID
+ , "HSCWHNumber": dataArray[i].HSCWHNumber == null ? "" : dataArray[i].HSCWHNumber
+ , "HSCWHName": dataArray[i].HSCWHName == null ? "" : dataArray[i].HSCWHName
+ , "HSCSPID": "0"
+ , "HSCSPNumber": ""
+ , "HSCSPName": ""
+ , "HSourceInterID": dataArray[i].HInterID == null ? 0 : dataArray[i].HInterID
+ , "HSourceEntryID": dataArray[i].HEntryID == null ? 0 : dataArray[i].HEntryID
+ , "HSourceBillType": dataArray[i].HBillType == null ? "" : dataArray[i].HBillType
+ , "HSourceBillNo": dataArray[i].HBillNo == null ? "" : dataArray[i].HBillNo
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+ , "HRemark": ""
+ , "HPropertyID": "0"
+ , "HSecUnitID": "0"
+ , "HSecUnitRate": "0"
+ , "HQtyMust": dataArray[i].HQty == null ? 0 : dataArray[i].HQty
+ , "HPrice": "0"
+ , "HMoney": "0"
+ , "HDesignLife": "0"
+ , "HLeaveLife": "0"
+ , "HPOOrderInterID": "0"
+ , "HPOOrderEntryID": "0"
+ , "HPOOrderBillNo": ""
+ , "HSeOrderInterID": "0"
+ , "HSeOrderEntryID": "0"
+ , "HSeOrderBillNo": ""
+ , "HSTOCKORGID": dataArray[i].HStockOutOrgID == null ? 0 : dataArray[i].HStockOutOrgID
+ , "HOtherOrgID": dataArray[i].HStockInOrgID == null ? 0 : dataArray[i].HStockInOrgID
+ , "HOWNERID": dataArray[i].HStockOutOrgID == null ? 0 : dataArray[i].HStockOutOrgID
+ , "HOWNERTYPEID": ""
+ , "HUseLife": "0"
+ , "HUseLifeQty": "0"
+ , "HNewLifeQty": "0"
+ , "HQtyRel": "0"
+ , "HSPGroupID": "0"
+ , "HNewModel": ""
+ , "HWallThickness": ""
+ , "HHardness": ""
+ , "HLastProdModel": ""
+ , "HDiameter": ""
+ , "HBackFlag": ""
+ , "HBarCode": ""
+ , "HMouldType": "0"
+ , "HInitModel": ""
+ , "HInitDesignLife": "0"
+ , "HLifeUnitID": "0"
+ , "HNowModel": ""
+ , "HNowLife": "0"
+ , "HCorrespondentTypeID": "0"
+ , "HCorrespondentID": "0"
+ }
+ )
+ }
+ this.editData = rowdata
+ },
//寮圭獥璧嬪��
dbEmitData(deptRow, num) {
// num=1閮ㄩ棬 num=2浠撳簱
- console.log(deptRow)
- if (deptRow.HItemID || deptRow.hmainid) {
- if (num == 1) {
- this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
- this.form.HDeptID = deptRow.HItemID
- this.deptShow = false
- this.openData = false
- } else if (num == 2) {
- if(this.eHWHType == 1){
- this.form.HWHName = deptRow.浠撳簱鍚嶇О
- this.form.HWHID = deptRow.HItemID
- this.form.HWHNumber = deptRow.浠撳簱浠ｇ爜
- }else if(this.eHWHType == 2){
- this.editData[this.zbIndex].HWHID = deptRow.HItemID
- this.editData[this.zbIndex].HWHCode = deptRow.浠撳簱浠ｇ爜
- this.editData[this.zbIndex].HWHName = deptRow.浠撳簱鍚嶇О
- }else if(this.eHWHType == 3){
- this.editData[this.zbIndex].HSCWHID = deptRow.HItemID
- this.editData[this.zbIndex].HSCWHCode = deptRow.浠撳簱浠ｇ爜
- this.editData[this.zbIndex].HSCWHName = deptRow.浠撳簱鍚嶇О
+ console.log(33,deptRow)
+ if(num == 3850){
+ if (deptRow.length > 0) {
+ var HSupTypeID_Temp = deptRow[0].HSupTypeID
+ var HStockInOrgID_Temp = deptRow[0].HStockInOrgID
+ for (var i = 0; i < deptRow.length; i++) {
+ if (deptRow[i].HSupTypeID != HSupTypeID_Temp) {
+ this.$modal.msgError("鎵�閫夊崟鎹搴斿線鏉ョ被鍨嬪繀椤讳竴鑷达紒");
+ }
+ if (deptRow[i].HStockInOrgID != HStockInOrgID_Temp) {
+ this.$modal.msgError("鎵�閫夊崟鎹搴旇皟鍏ョ粍缁囧繀椤讳竴鑷达紒");
+ }
}
- this.warehouseShow = false
- this.openData = false
- } else if (num == 4) {
- if(this.empType == 1){
- this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
- this.form.HSecManagerID = deptRow.HItemID
- }else{
- this.form.HKeeperName = deptRow.鑱屽憳鍚嶇О
- this.form.HKeeperID = deptRow.HItemID
- }
- this.gyEmployeeShow = false
- this.openData = false
- } else if (num == 8){
- this.editData[this.zbIndex].HMaterID = deptRow.hmainid
- this.editData[this.zbIndex].HMaterCode = deptRow.妯″叿缂栧彿
- this.editData[this.zbIndex].HMaterName = deptRow.妯″叿鍚嶇О
- this.editData[this.zbIndex].HMaterSpec = deptRow.妯″叿鍨嬪彿
- this.editData[this.zbIndex].HUnitID = deptRow.HUnitID
- this.editData[this.zbIndex].HUnitCode = deptRow.璁￠噺鍗曚綅浠ｇ爜
- this.editData[this.zbIndex].HUnitName = deptRow.璁￠噺鍗曚綅
- this.editData[this.zbIndex].HQty = 1
- this.gyMouldShow = false
- this.openData = false
- } else if (num == 9){
- if(this.HSPType == 1){
- this.editData[this.zbIndex].HSPID = deptRow.HMainID
- this.editData[this.zbIndex].HSPCode = deptRow.浠撲綅浠ｇ爜
- this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
- }else{
- this.editData[this.zbIndex].HSCSPID = deptRow.HMainID
- this.editData[this.zbIndex].HSCSPCode = deptRow.浠撲綅浠ｇ爜
- this.editData[this.zbIndex].HSCSPName = deptRow.浠撲綅鍚嶇О
- }
- this.gyStockPlaceShow = false
- this.openData = false
- }
- } else {
- this.$modal.msgError("璇烽�夋嫨鍗曟潯鏁版嵁!");
- }
+ var dataArray = [];
+ for (var i = 0; i < deptRow.length; i++) {
+ var temp = this.GetSourceBillList(deptRow[i].hmainid, deptRow[i].hsubid, deptRow[i].HBillType)
+ console.log(718,temp)
+ if (temp != "none") {
+ dataArray.push(temp);
+ } else {
+ this.$modal.msgError("鏈煡璇㈠埌婧愬崟淇℃伅锛岃鍒锋柊婧愬崟鍒楄〃鍚庨噸鏂伴�夋嫨瀵瑰簲婧愬崟锛�");
+ }
+ }
+ this.setInitBySourceBill(dataArray)
+
+ this.scMouldMoveShow = false
+ this.openData = false
+ } else {
+ this.$modal.msgError("璇烽�夋嫨鏁版嵁!");
+ }
+ }else{
+ if (deptRow.HItemID || deptRow.hmainid) {
+ if (num == 1) {
+ if(this.deptType == 1){
+ this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
+ this.form.HDeptID = deptRow.HItemID
+ }else{
+ this.form.HSupName = deptRow.閮ㄩ棬鍚嶇О
+ this.form.HSupID = deptRow.HItemID
+ }
+ this.deptShow = false
+ this.openData = false
+ } else if (num == 2) {
+ if(this.eHWHType == 1){
+ this.form.HWHName = deptRow.浠撳簱鍚嶇О
+ this.form.HWHID = deptRow.HItemID
+ this.form.HWHNumber = deptRow.浠撳簱浠ｇ爜
+ }else if(this.eHWHType == 2){
+ this.form.HSCWHName = deptRow.浠撳簱鍚嶇О
+ this.form.HSCWHID = deptRow.HItemID
+ this.form.HSCWHNumber = deptRow.浠撳簱浠ｇ爜
+ }else if(this.eHWHType == 3){
+ this.editData[this.zbIndex].HWHID = deptRow.HItemID
+ this.editData[this.zbIndex].HWHNumber = deptRow.浠撳簱浠ｇ爜
+ this.editData[this.zbIndex].HWHName = deptRow.浠撳簱鍚嶇О
+ }else if(this.eHWHType == 4){
+ this.editData[this.zbIndex].HSCWHID = deptRow.HItemID
+ this.editData[this.zbIndex].HSCWHNumber = deptRow.浠撳簱浠ｇ爜
+ this.editData[this.zbIndex].HSCWHName = deptRow.浠撳簱鍚嶇О
+ }
+ this.warehouseShow = false
+ this.openData = false
+ } else if (num == 4) {
+ if(this.empType == 1){
+ this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
+ this.form.HEmpID = deptRow.HItemID
+ }else if(this.empType == 2){
+ this.form.HMangerName = deptRow.鑱屽憳鍚嶇О
+ this.form.HMangerID = deptRow.HItemID
+ }else if(this.empType == 3){
+ this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
+ this.form.HSecManagerID = deptRow.HItemID
+ }else if(this.empType == 4){
+ this.form.HKeeperName = deptRow.鑱屽憳鍚嶇О
+ this.form.HKeeperID = deptRow.HItemID
+ }else
+ this.gyEmployeeShow = false
+ this.openData = false
+ } else if (num == 6) {
+ this.form.HSupName = deptRow.渚涘簲鍟嗗悕绉�
+ this.form.HSupID = deptRow.HItemID
+ this.gySupplierShow = false
+ this.openData = false
+ } else if (num == 7) {
+ this.form.HSupName = deptRow.瀹㈡埛鍚嶇О
+ this.form.HSupID = deptRow.HItemID
+ this.gyCustomerShow = false
+ this.openData = false
+ } else if (num == 8){
+ this.editData[this.zbIndex].HMaterID = deptRow.hmainid
+ this.editData[this.zbIndex].HMaterNumber = deptRow.妯″叿缂栧彿
+ this.editData[this.zbIndex].HMaterName = deptRow.妯″叿鍚嶇О
+ this.editData[this.zbIndex].HMaterModel = deptRow.妯″叿鍨嬪彿
+ this.editData[this.zbIndex].HUnitID = deptRow.HUnitID
+ this.editData[this.zbIndex].HUnitNumber = deptRow.璁￠噺鍗曚綅浠ｇ爜
+ this.editData[this.zbIndex].HUnitName = deptRow.璁￠噺鍗曚綅
+ this.editData[this.zbIndex].HQty = 1
+ this.editData[this.zbIndex].HDesignLife = 0
+ this.editData[this.zbIndex].HLeaveLife = 0
+ this.editData[this.zbIndex].HMoney = 0
+ this.gyMouldShow = false
+ this.openData = false
+ } else if (num == 9){
+ if(this.HSPType == 1){
+ this.editData[this.zbIndex].HSPID = deptRow.HMainID
+ this.editData[this.zbIndex].HSPCode = deptRow.浠撲綅浠ｇ爜
+ this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
+ }else{
+ this.editData[this.zbIndex].HSCSPID = deptRow.HMainID
+ this.editData[this.zbIndex].HSCSPCode = deptRow.浠撲綅浠ｇ爜
+ this.editData[this.zbIndex].HSCSPName = deptRow.浠撲綅鍚嶇О
+ }
+ this.gyStockPlaceShow = false
+ this.openData = false
+ }
+ } else {
+ this.$modal.msgError("璇烽�夋嫨鍗曟潯鏁版嵁!");
+ }
+ }
},
emitData(deptRow, num) {
this.dialogTypeNum = num
@@ -744,69 +944,98 @@
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
+ /** 涓嬫帹鎵撳紑 */
+ handleMove() {
+ this.reset()
+ //鏂板鑾峰彇鍗曟嵁鍙�
+ this.getHBillNo()
+ let date = new Date()
+ this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+
+ //璁剧疆婧愬崟绫诲瀷
+ this.form.HSourceBillType = this.HSouceBillType
+ //鑾峰彇婧愬崟鏁版嵁
+ var data = this.getUrlVars_JSON().data;
+ var dataArray = [];
+ for (var i = 0; i < data.length; i++) {
+ var temp = this.GetSourceBillList(data[i].hmainid, data[i].hsubid, data[i].HBillType)
+ console.log(temp)
+ if (temp != "none") {
+ dataArray.push(temp);
+ } else {
+ this.$modal.msgError("鏈煡璇㈠埌鍗曟嵁鍙笅鎺ㄦ暟鎹紝璇峰埛鏂板崟鎹垪琛ㄥ悗閲嶆柊閫夋嫨鍗曟嵁涓嬫帹锛�");
+ return;
+ }
+ }
+ this.$nextTick(() => {
+ this.setInitBySourceBill(dataArray);
+ this.OperationType = 1;
+ this.formShow = true
+ this.formLoading = false
+ })
+ },
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate() {
this.reset()
let rowHmainid = this.linterid
console.log(this.linterid)
//涓昏〃
- axios.get(this.baseURL + "/Sc_MouldProdMoveBill/Sc_MouldProdMoveBillListCheckDetai", {
- params: { 'HID': rowHmainid }
+ axios.get(this.baseURL + "/Sc_MouldStockBillController/GetSc_MouldStockBill_Json", {
+ params: { 'HInterID': rowHmainid,"HMaker": sessionStorage["HUserName"] }
}).then(response => {
- if (response.data.code == 1) {
- var data = response.data.data.h_v_Sc_MouldProdMoveBill_Edit[0]
- console.log(data)
+ if (response.data.count == 1) {
+ var data = response.data.data[0]
+ // console.log(response.data)
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.鍗曟嵁鍙�
- , "HDate": data.鏃ユ湡
- , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HWHID": data.HWHID1 //浠撳簱ID
- , "HWHName": data.鍣ㄥ叿浠撳簱 //浠撳簱鍚嶇О
- , "HSecManagerID": data.hsecmanagerid //楠屾敹鍛業D
- , "HSecManagerName": data.棰嗘枡浜� //楠屾敹鍛樺悕绉�
- , "HKeeperID": data.hkeeperid //淇濈鍛業D
- , "HKeeperName": data.鍙戞枡浜� //淇濈鍛樺悕绉�
- , "HDeptID": data.HDeptID //閮ㄩ棬ID
- , "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
- , "HSourceBillType": "" //婧愬崟绫诲瀷
- , "XDH": "" //閫夊崟鍙�
- , "HExplanation": data.鎽樿 //鎽樿
- , "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
- , "HStockStyle": data.璋冩嫧绫诲瀷
-
- , "HMaker": data.鍒跺崟浜�
- , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
- , "HChecker": data.瀹℃牳浜�
- , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : data.瀹℃牳鏃ユ湡
- , "HUpDater": data.淇敼浜�
- , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : data.淇敼鏃ユ湡
- , "HCloseMan": data.鍏抽棴浜�
- , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : data.鍏抽棴鏃ユ湡
- , "HDeleteMan": data.浣滃簾浜�
- , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : data.浣滃簾鏃ユ湡
+ if (data[0].HSourceInterID != "0") {
+ this.ifOrganizationEdit = true
}
+ this.form = {
+ "HBillNo": data[0].鍗曟嵁鍙�
+ , "HDate": data[0].鏃ユ湡
+ , "HSupTypeID": data[0].HSupTypeID
+ , "HSupID": data[0].HSupID
+ , "HSupName": data[0].寰�鏉ュ崟浣�
+ , "HDeptID": data[0].HDeptID
+ , "HDeptName": data[0].閮ㄩ棬
+ , "HWHID": data[0].HMainWHID
+ , "HWHName": data[0].璋冨叆浠撳簱
+ , "HSCWHID": data[0].HMainSCWHID
+ , "HSCWHName": data[0].璋冨嚭浠撳簱
+ , "HEmpID": data[0].HEmpID
+ , "HEmpName": data[0].涓氬姟鍛�
+ , "HManagerID": data[0].HManagerID
+ , "HManagerName": data[0].璐熻矗浜�
+ , "HSecManagerID": data[0].HSecManagerID
+ , "HSecManagerName": data[0].楠屾敹鍛�
+ , "HKeeperID": data[0].HKeeperID
+ , "HKeeperName": data[0].淇濈鍛�
+ , "HExplanation": data[0].鎽樿
+ , "HRemark": data[0].琛ㄥご澶囨敞
+ , "HInnerBillNo": data[0].鍐呴儴鍗曟嵁鍙�
+ , "HStockInOrgID": data[0].HStockInOrgID
+ , "HStockOutOrgID": data[0].HStockOutOrgID
+ , "HMaker": data[0].鍒跺崟浜�
+ , "HChecker": data[0].瀹℃牳浜�
+ , "HCloseMan": data[0].鍏抽棴浜�
+ , "HUpDater": data[0].淇敼浜�
+ , "HDeleteMan": data[0].浣滃簾浜�
+ , "HMakeDate": data[0].鍒跺崟鏃ユ湡 == null ? "" : data[0].鍒跺崟鏃ユ湡
+ , "HCheckDate": data[0].瀹℃牳鏃ユ湡 == null ? "" : data[0].瀹℃牳鏃ユ湡
+ , "HCloseDate": data[0].鍏抽棴鏃ユ湡 == null ? "" : data[0].鍏抽棴鏃ユ湡
+ , "HUpDateDate": data[0].淇敼鏃ユ湡 == null ? "" : data[0].淇敼鏃ユ湡
+ , "HDeleteDate": data[0].浣滃簾鏃ユ湡 == null ? "" : data[0].浣滃簾鏃ユ湡
+ }
+ this.form.HStockInOrgID = data[0].HStockInOrgID == null ? 0 : data[0].HStockInOrgID;
+ this.form.HStockOutOrgID = data[0].HStockOutOrgID == null ? 0 : data[0].HStockOutOrgID;
+ //瀛愯〃 璧嬪��
+ this.editData = response.data.data[0];
+ this.editData1 = response.data.data[1];
}
- this.formShow = true
- this.formLoading = false
- }
- }).catch(error => {
- console.log(error)
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- //瀛愯〃
- axios.get(this.baseURL + "/Sc_MouldProdMoveBill/Sc_MouldProdMoveBillListProjectDetai", {
- params: { 'sqlWhere': "and hmainid=" + rowHmainid }
- }).then(response => {
- if (response.data.count == 1) {
- var data = response.data
- console.log(data)
- this.editData = data.list[0]
- this.editData1 = data.list[1]
this.formShow = true
this.formLoading = false
}
@@ -825,38 +1054,72 @@
this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
} else {
let obj = {
- HBatchNo: "",
- HDesignLife: 0,
- HLeaveLife: 0,
- HMaterCode:"",
- HMaterID:0,
- HMaterName:"",
- HMaterSpec:"",
- HMoney:0,
- HPrice:0,
- HQty:0,
- HQtyMust:0,
- HSPCode:"",
- HSPID:0,
- HSPName:"",
- HOtherOrgID:sessionStorage["OrganizationID"] - 0,//缁勭粐id
- HStockOrgID:0,
- HStockOrgCode:"",
- HStockOrgName:"",
- HUnitCode:"",
- HUnitID:0,
- HUnitName:"",
- HUseLife:0,
- HWHCode:"",
- HWHID:0,
- HWHName:"",
- HSCWHID:0,
- HSCWHCode:"",
- HSCWHName:"",
- HSCSPID:0,
- HSCSPCode:"",
- HSCSPName:"",
- HRemark:"",
+ "HMaterID": "0"
+ , "HMaterNumber": ""
+ , "HMaterName": ""
+ , "HMaterModel": ""
+ , "HUnitID": "0"
+ , "HUnitNumber": ""
+ , "HUnitName": ""
+ , "HBatchNo": ""
+ , "HQty": "0"
+ , "HWHID": "0"
+ , "HWHNumber": ""
+ , "HWHName": ""
+ , "HSPID": "0"
+ , "HSPNumber": ""
+ , "HSPName": ""
+ , "HSCWHID": "0"
+ , "HSCWHNumber": ""
+ , "HSCWHName": ""
+ , "HSCSPID": "0"
+ , "HSCSPNumber": ""
+ , "HSCSPName": ""
+ , "HSourceInterID": "0"
+ , "HSourceEntryID": "0"
+ , "HSourceBillType": ""
+ , "HSourceBillNo": ""
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+ , "HRemark": ""
+ , "HPropertyID": "0"
+ , "HSecUnitID": "0"
+ , "HSecUnitRate": "0"
+ , "HQtyMust": "0"
+ , "HPrice": "0"
+ , "HMoney": "0"
+ , "HDesignLife": "0"
+ , "HLeaveLife": "0"
+ , "HPOOrderInterID": "0"
+ , "HPOOrderEntryID": "0"
+ , "HPOOrderBillNo": ""
+ , "HSeOrderInterID": "0"
+ , "HSeOrderEntryID": "0"
+ , "HSeOrderBillNo": ""
+ , "HSTOCKORGID": sessionStorage["OrganizationID"] - 0
+ , "HOtherOrgID": sessionStorage["OrganizationID"] - 0
+ , "HOWNERID": sessionStorage["OrganizationID"] - 0
+ , "HOWNERTYPEID": ""
+ , "HUseLife": "0"
+ , "HUseLifeQty": "0"
+ , "HNewLifeQty": "0"
+ , "HQtyRel": "0"
+ , "HSPGroupID": "0"
+ , "HNewModel": ""
+ , "HWallThickness": ""
+ , "HHardness": ""
+ , "HLastProdModel": ""
+ , "HDiameter": ""
+ , "HBackFlag": ""
+ , "HBarCode": ""
+ , "HMouldType": "0"
+ , "HInitModel": ""
+ , "HInitDesignLife": "0"
+ , "HLifeUnitID": "0"
+ , "HNowModel": ""
+ , "HNowLife": "0"
+ , "HCorrespondentTypeID": "0"
+ , "HCorrespondentID": "0"
}
if (index) {
this.editData.splice(index, 0, obj);
@@ -931,7 +1194,7 @@
let fhck = false
if(this.editData.length == 0){
fhck = true
- this.$modal.msgError("娌℃湁鐗╂枡鏄庣粏璁板綍锛�");
+ this.$modal.msgError("娌℃湁鏄庣粏璁板綍锛�");
}
this.editData.map((item, index) => {
if (!item.HMaterID) {
@@ -943,19 +1206,31 @@
}else if(!item.HSCWHID){
fhck = true
this.$modal.msgError("绗�" + (index + 1) + "琛岋細璋冨嚭浠撳簱鏈�夋嫨锛�");
+ }else if(!item.HUnitID){
+ fhck = true
+ this.$modal.msgError("绗�" + (index + 1) + "琛岋細璁￠噺鍗曚綅涓虹┖锛�");
+ }else if(item.HQty == 0){
+ fhck = true
+ this.$modal.msgError("绗�" + (index + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
}
})
this.$nextTick(() => {
if (!fhck) {
- if(this.OperationType == 3){
- this.form.HInterID = this.linterid
+ var Operation = null
+ if(!this.OperationType){
+ Operation = 1
+ }else{
+ Operation = this.OperationType
+ if(Operation == 2){
+ this.form.HInterID = this.linterid
+ }
}
var sMainStr = JSON.stringify(this.form);
var sSubStr = JSON.stringify(this.editData);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + Operation + ";" + sessionStorage["HUserName"];
axios({
method: 'post',
- url: this.baseURL + "/Sc_MouldProdMoveBill/SaveGetMouldProdMoveBillList",
+ url: this.baseURL + "/Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Save_Json",
data: {
'msg': sMainSub
},
@@ -984,12 +1259,13 @@
set_CheckBill(num, form) {
var InterID = form.hmainid || form.HInterID
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.baseURL + "/Sc_MouldProdMoveBill/AuditMouldProdMoveBill", {
- params: { "HInterID": InterID, "flag": num, "user": sessionStorage["HUserName"] }
+ axios.get(this.baseURL + "/Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Check_Json", {
+ params: { "HInterID": InterID, "Type": num, "HMaker": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
if (result.code == 1) {
this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.close()
}
else {
this.$modal.msgError("閿欒:" + result.code + result.Message,);
@@ -1006,6 +1282,7 @@
this.gyCustomerShow = false
this.gyMouldShow = false
this.gyStockPlaceShow = false
+ this.scMouldMoveShow = false
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
@@ -1046,8 +1323,31 @@
this.dialogTitle = '浠撲綅鍒楄〃'
this.gyStockPlaceShow = true
this.openData = true
+ } else if (num == 3850) {
+ this.dialogTitle = '鍣ㄥ叿璋冩嫧鐢宠鍗曞垪琛�'
+ this.scMouldMoveShow = true
+ this.openData = true
}
},
+ //鏍规嵁寰�鏉ョ被鍨嬪垽鏂線鏉ュ崟浣�
+ openDataDialogChoose(){
+ if(this.form.HSupTypeID == 1){
+ this.openDataDialog(6)
+ }else if(this.form.HSupTypeID == 2){
+ this.openDataDialog(7)
+ }else if(this.form.HSupTypeID == 3){
+ this.deptType = 2
+ this.openDataDialog(1)
+ }
+ },
+ //閫夋嫨婧愬崟
+ get_checkMainSource(){
+ if(this.form.HSourceBillType == "3850"){
+ this.openDataDialog(3850)
+ }else{
+ this.$modal.msgError("鏈煡璇㈠埌鎵�閫夋簮鍗曠被鍨嬬浉鍏冲崟鎹俊鎭�!");
+ }
+ },
}
};
</script>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
index 2dea67a..cefd064 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
@@ -25,36 +25,34 @@
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
<el-card class="box-card">
- <el-form-item label="缁勭粐鍚嶇О" prop="HStockOrgName">
- <el-input v-model="queryParams.HStockOrgName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keyup.enter.native="handleQuery" />
- </el-form-item>
- <!-- <el-form-item label="缁勭粐">
- <el-select v-model="queryParams.HOrgID" placeholder="璇烽�夋嫨">
- <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
- </el-option>
- </el-select>
- </el-form-item> -->
- <el-form-item label="閮ㄩ棬淇℃伅" prop="HDept">
- <el-input v-model="queryParams.HDept" placeholder="璇疯緭鍏ラ儴闂ㄤ俊鎭�" @keyup.enter.native="handleQuery" />
- </el-form-item>
- <el-form-item label="鐗╂枡浠ｇ爜" prop="HMaterNumber">
- <el-input v-model="queryParams.HMaterNumber" placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�" @keyup.enter.native="handleQuery" />
- </el-form-item>
- <el-form-item label="鍣ㄥ叿浠ｇ爜" prop="HModelNumber">
- <el-input v-model="queryParams.HModelNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�" @keyup.enter.native="handleQuery" />
- </el-form-item>
- <el-form-item label="浠撳簱" prop="HWhName">
- <el-input v-model="queryParams.HWhName" placeholder="璇疯緭鍏ヤ粨搴�" @keyup.enter.native="handleQuery" />
- </el-form-item>
- <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
- <el-input v-model="queryParams.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" @keyup.enter.native="handleQuery" />
- </el-form-item>
- <div slot="header" class="clearfix"><span>杩囨护</span></div>
+ <el-form-item label="鐘舵��" prop="HStatus">
+ <el-select v-model="queryParams.HStatus" placeholder="璇烽�夋嫨鐘舵��">
+ <el-option v-for="(item, index) in HStatusList" :key="index" :label="item.name" :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璋冨嚭缁勭粐">
+ <el-select v-model="queryParams.HStockOutOrgID" placeholder="璇烽�夋嫨">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="閮ㄩ棬淇℃伅" prop="HDept">
+ <el-input v-model="queryParams.HDept" placeholder="璇疯緭鍏ラ儴闂ㄤ俊鎭�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鍣ㄥ叿浠ｇ爜" prop="HModelNumber">
+ <el-input v-model="queryParams.HModelNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
+ <el-input v-model="queryParams.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <div slot="header" class="clearfix"><span>鍏朵粬鏉′欢</span></div>
<div>
<el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange">
<span v-for="(item, index) in btList" :key="index">
<el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
@@ -67,7 +65,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -77,7 +75,8 @@
<el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange">
<span v-for="(item, index) in btList" :key="index">
<el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
@@ -90,7 +89,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -99,7 +98,8 @@
</el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange">
<el-option v-for="(item, index) in btList" :key="index" :label="item.field"
:value="item.field"></el-option>
@@ -111,7 +111,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -253,7 +253,7 @@
{ label: '杩戜竴骞�', value: 365 },
],
organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
- hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
+ HStatusList: [{name:'鍏ㄩ儴',value:'-1'},{name:'鏈鏍�',value:'0'},{name:'宸插鏍�',value:'1'},{name:'宸插叧闂�',value:'2'}],
addBtnShow: false,
dialogTitle: '',
OperationType: null,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
@@ -271,11 +271,10 @@
queryParams: {
HBillNo: '',
HInitTimeCycle: 29,
- HStockOrgName: '',
+ HStockOutOrgID: sessionStorage["OrganizationID"] - 0,
+ HStatus:'-1',
HDept:'',
- HMaterNumber: '',
HModelNumber:'',
- HWhName:'',
HSupName:'',
ColName1: '',
ColName2: '',
@@ -374,20 +373,23 @@
this.tableShow = false
this.loading = true
if (this.sTime && !this.sWhere) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'"
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'"
+ this.sTime = moment(this.sTime).format('YYYY-MM-DD')
+ this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+ this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
+ this.sWhere += " and 鏃ユ湡 <= '" + this.eTime + "'";
}
+ this.sWhere += " and HSTOCKORGID=" + this.queryParams.HStockOutOrgID;
if (this.pageSize == 0) {
this.pageSize = 50
}
// 閿�鍞嚭搴撳崟鍒楄〃
- axios.get(this.baseURL + '/Sc_MouldProdMoveBill/page', {
+ axios.get(this.baseURL + '/Sc_MouldProdMoveBillController/page', {
params: {
"sWhere": this.sWhere,
"user": sessionStorage["HUserName"],
- "Organization": sessionStorage["Organization"],
"page": this.page,
- "size": this.pageSize
+ "size": this.pageSize,
+ "Type": '3814',
},
}).then(response => {
this.tyResList = response.data.data//鎬绘暟鎹�
@@ -583,7 +585,7 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 3
- this.handleEdit()
+ this.handleEdit(row)
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -661,34 +663,44 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
- if (this.sTime) {
- this.sTime = moment(this.sTime).format('YYYY-MM-DD')
- this.eTime = moment(this.eTime).format('YYYY-MM-DD')
- console.log(this.sTime, this.eTime)
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'" + " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
+ if (this.queryParams.HStatus) {
+ switch (this.queryParams.HStatus) {
+ case '-1': //鍏ㄩ儴
+ this.sWhere += "";
+ break;
+ case '0': //鏈鏍�
+ this.sWhere += " and 瀹℃牳浜�=''";
+ break;
+ case '1': //宸插鏍�
+ this.sWhere += " and 瀹℃牳浜�<>''";
+ break;
+ case '2': //宸插叧闂�
+ this.sWhere += " and 鍏抽棴浜�<>''";
+ default:
+ }
}
-
+ if (this.sTime) {
+ this.sTime = moment(this.sTime).format('YYYY-MM-DD')
+ this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
+ }
+ if (this.eTime) {
+ this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+ this.sWhere += " and 鏃ユ湡 <= '" + this.eTime + "'";
+ }
if (this.queryParams.HBillNo) {
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
- }
- if (this.queryParams.HStockOrgName) {
- this.sWhere += " and 缁勭粐鍚嶇О like '%" + this.queryParams.HStockOrgName + "%'";
}
if (this.queryParams.HDept) {
this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
}
- if (this.queryParams.HMaterNumber) {
- this.sWhere += " and 鐗╂枡浠ｇ爜 like '%" + this.queryParams.HMaterNumber + "%'";
- }
if (this.queryParams.HModelNumber) {
- this.sWhere += " and 妯″叿浠ｇ爜 like '%" + this.queryParams.HModelNumber + "%'";
- }
- if (this.queryParams.HWhName) {
- this.sWhere += " and 浠撳簱 like '%" + this.queryParams.HWhName + "%'";
+ this.sWhere += " and 鍣ㄥ叿浠ｇ爜 like '%" + this.queryParams.HModelNumber + "%'";
}
if (this.queryParams.HSupName) {
this.sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
}
+
+ this.clearData()
this.getList()
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
@@ -697,11 +709,10 @@
this.queryParams = {
HBillNo: '',
HInitTimeCycle: 29,
- HStockOrgName: '',
+ HStockOutOrgID: sessionStorage["OrganizationID"] - 0,
+ HStatus:'-1',
HDept:'',
- HMaterNumber: '',
HModelNumber:'',
- HWhName:'',
HSupName:'',
ColName1: '',
ColName2: '',
@@ -715,6 +726,7 @@
}
this.riqiChange()
this.resetForm("queryForm")
+ this.clearData()
this.getList()
},
@@ -724,6 +736,7 @@
this.tableShow = true
this.openEdit = false
this.editShow = false
+ this.clearData()
this.getList()
},
//鎵撳紑鏂板缁勪欢寮圭獥
@@ -743,7 +756,16 @@
this.open = val
this.editShow = false
this.openEdit = val
+ this.clearData()
this.getList()
+ },
+ //娓呴櫎閫変腑鏁版嵁鐨勭紦瀛�
+ clearData(){
+ this.ids = []
+ this.multiple = true
+ this.single = true
+ this.OperationType = 0
+ this.copyType = 0
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
@@ -772,6 +794,7 @@
let result = response.data
if (result.count == 1) {
this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.clearData()
this.getList();
}
else {
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
index 38aa162..577ab4e 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
@@ -25,30 +25,34 @@
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
<el-card class="box-card">
- <el-form-item label="缁勭粐鍚嶇О" prop="HStockOrgName">
- <el-input v-model="queryParams.HStockOrgName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keyup.enter.native="handleQuery" />
+ <el-form-item label="鐘舵��" prop="HStatus">
+ <el-select v-model="queryParams.HStatus" placeholder="璇烽�夋嫨鐘舵��">
+ <el-option v-for="(item, index) in HStatusList" :key="index" :label="item.name" :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="缁勭粐">
+ <el-select v-model="queryParams.HStockOrgID" placeholder="璇烽�夋嫨">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item label="閮ㄩ棬淇℃伅" prop="HDept">
<el-input v-model="queryParams.HDept" placeholder="璇疯緭鍏ラ儴闂ㄤ俊鎭�" @keyup.enter.native="handleQuery" />
</el-form-item>
- <el-form-item label="鐗╂枡浠ｇ爜" prop="HMaterNumber">
- <el-input v-model="queryParams.HMaterNumber" placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�" @keyup.enter.native="handleQuery" />
- </el-form-item>
<el-form-item label="鍣ㄥ叿浠ｇ爜" prop="HModelNumber">
<el-input v-model="queryParams.HModelNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�" @keyup.enter.native="handleQuery" />
- </el-form-item>
- <el-form-item label="浠撳簱" prop="HWhName">
- <el-input v-model="queryParams.HWhName" placeholder="璇疯緭鍏ヤ粨搴�" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
<el-input v-model="queryParams.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" @keyup.enter.native="handleQuery" />
</el-form-item>
- <div slot="header" class="clearfix"><span>杩囨护</span></div>
+ <div slot="header" class="clearfix"><span>鍏朵粬鏉′欢</span></div>
<div>
<el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange">
<span v-for="(item, index) in btList" :key="index">
<el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
@@ -61,7 +65,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -71,7 +75,8 @@
<el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange">
<span v-for="(item, index) in btList" :key="index">
<el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
@@ -84,7 +89,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -93,7 +98,8 @@
</el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange">
<el-option v-for="(item, index) in btList" :key="index" :label="item.field"
:value="item.field"></el-option>
@@ -105,7 +111,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -246,7 +252,8 @@
{ label: '杩戝崐骞�', value: 180 },
{ label: '杩戜竴骞�', value: 365 },
],
- hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
+ organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
+ HStatusList: [{name:'鍏ㄩ儴',value:'-1'},{name:'鏈鏍�',value:'0'},{name:'宸插鏍�',value:'1'},{name:'宸插叧闂�',value:'2'}],
addBtnShow: false,
dialogTitle: '',
OperationType: null,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
@@ -264,11 +271,10 @@
queryParams: {
HBillNo: '',
HInitTimeCycle: 29,
- HStockOrgName: '',
+ HStockOrgID: sessionStorage["OrganizationID"] - 0,
+ HStatus:'-1',
HDept:'',
- HMaterNumber: '',
HModelNumber:'',
- HWhName:'',
HSupName:'',
ColName1: '',
ColName2: '',
@@ -367,20 +373,23 @@
this.tableShow = false
this.loading = true
if (this.sTime && !this.sWhere) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'"
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'"
+ this.sTime = moment(this.sTime).format('YYYY-MM-DD')
+ this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+ this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
+ this.sWhere += " and 鏃ユ湡 <= '" + this.eTime + "'";
}
+ this.sWhere += " and HSTOCKORGID=" + this.queryParams.HStockOrgID
if (this.pageSize == 0) {
this.pageSize = 50
}
- // 閿�鍞嚭搴撳崟鍒楄〃
- axios.get(this.baseURL + '/Sc_MouldProdOutBill/list_byPage', {
+ // 鍒嗛〉鏌ヨ
+ axios.get(this.baseURL + '/Sc_MouldProdOutBillController/page', {
params: {
"sWhere": this.sWhere,
"user": sessionStorage["HUserName"],
- "Organization": sessionStorage["Organization"],
"page": this.page,
- "size": this.pageSize
+ "size": this.pageSize,
+ "Type":'3802',
},
}).then(response => {
this.tyResList = response.data.data//鎬绘暟鎹�
@@ -577,7 +586,7 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 3
- this.handleEdit()
+ this.handleEdit(row)
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -655,34 +664,43 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
+ if (this.queryParams.HStatus) {
+ switch (this.queryParams.HStatus) {
+ case '-1': //鍏ㄩ儴
+ this.sWhere += "";
+ break;
+ case '0': //鏈鏍�
+ this.sWhere += " and 瀹℃牳浜�=''";
+ break;
+ case '1': //宸插鏍�
+ this.sWhere += " and 瀹℃牳浜�<>''";
+ break;
+ case '2': //宸插叧闂�
+ this.sWhere += " and 鍏抽棴浜�<>''";
+ default:
+ }
+ }
if (this.sTime) {
this.sTime = moment(this.sTime).format('YYYY-MM-DD')
- this.eTime = moment(this.eTime).format('YYYY-MM-DD')
- console.log(this.sTime, this.eTime)
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'" + " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
+ this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
}
-
+ if (this.eTime) {
+ this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+ this.sWhere += " and 鏃ユ湡 <= '" + this.eTime + "'";
+ }
if (this.queryParams.HBillNo) {
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
- }
- if (this.queryParams.HStockOrgName) {
- this.sWhere += " and 缁勭粐鍚嶇О like '%" + this.queryParams.HStockOrgName + "%'";
}
if (this.queryParams.HDept) {
this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
}
- if (this.queryParams.HMaterNumber) {
- this.sWhere += " and 鐗╂枡浠ｇ爜 like '%" + this.queryParams.HMaterNumber + "%'";
- }
if (this.queryParams.HModelNumber) {
- this.sWhere += " and 妯″叿浠ｇ爜 like '%" + this.queryParams.HModelNumber + "%'";
- }
- if (this.queryParams.HWhName) {
- this.sWhere += " and 浠撳簱 like '%" + this.queryParams.HWhName + "%'";
+ this.sWhere += " and 鍣ㄥ叿浠ｇ爜 like '%" + this.queryParams.HModelNumber + "%'";
}
if (this.queryParams.HSupName) {
this.sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
}
+ this.clearData()
this.getList()
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
@@ -691,11 +709,10 @@
this.queryParams = {
HBillNo: '',
HInitTimeCycle: 29,
- HStockOrgName: '',
+ HStockOrgID: sessionStorage["OrganizationID"] - 0,
+ HStatus:'-1',
HDept:'',
- HMaterNumber: '',
HModelNumber:'',
- HWhName:'',
HSupName:'',
ColName1: '',
ColName2: '',
@@ -709,6 +726,7 @@
}
this.riqiChange()
this.resetForm("queryForm")
+ this.clearData()
this.getList()
},
@@ -718,6 +736,7 @@
this.tableShow = true
this.openEdit = false
this.editShow = false
+ this.clearData()
this.getList()
},
//鎵撳紑鏂板缁勪欢寮圭獥
@@ -737,7 +756,16 @@
this.open = val
this.editShow = false
this.openEdit = val
+ this.clearData()
this.getList()
+ },
+ //娓呴櫎閫変腑鏁版嵁鐨勭紦瀛�
+ clearData(){
+ this.ids = []
+ this.multiple = true
+ this.single = true
+ this.OperationType = 0
+ this.copyType = 0
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
@@ -766,6 +794,7 @@
let result = response.data
if (result.count == 1) {
this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.clearData()
this.getList();
}
else {
--
Gitblit v1.9.1