From e3cadadc1e03e0648a079f7fc8bf8b3d0d64bc27 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 15 四月 2024 15:54:04 +0800
Subject: [PATCH] wms的出库入库调拨 3个模块新建，编辑，列表增加 主管，会计，保管员3个字段以及新建，编辑联调
---
src/views/overview/AddOverviewDialog.vue | 976 +++++++++++++++++++++++++++++++++---------------
src/views/overview/OverviewListView.vue | 39 +
src/components/makepager/TableCommonView.vue | 2
src/components/makepager/SimpleSearchInput.vue | 139 +++++-
src/api/product/product.js | 8
5 files changed, 815 insertions(+), 349 deletions(-)
diff --git a/src/api/product/product.js b/src/api/product/product.js
index 12cc022..27234ff 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -9,6 +9,14 @@
data
})
}
+// 浜哄憳鍒楄〃
+export function getPersonnelList(data) {
+ return request({
+ url: "/api-wms/v1/operation/getPersonnelList",
+ method: "get",
+ data
+ })
+}
// 娣诲姞浜у搧
export function addProduct(data) {
return request({
diff --git a/src/components/makepager/SimpleSearchInput.vue b/src/components/makepager/SimpleSearchInput.vue
index 76a5dee..9b93314 100644
--- a/src/components/makepager/SimpleSearchInput.vue
+++ b/src/components/makepager/SimpleSearchInput.vue
@@ -44,21 +44,37 @@
<ul class="infinite-list" @scroll="loadList">
<div class="background_color_eee">
<el-row :gutter="0">
- <el-col :span="13">
- <div class="grid-content bg-purple">
- <span class="name">浜у搧鍚嶇О</span>
- </div>
- </el-col>
- <el-col :span="8">
- <div class="grid-content bg-purple">浜у搧缂栫爜</div>
- </el-col>
+ <template v-if="request==2">
+ <el-col :span="12">
+ <div class="grid-content bg-purple">
+ <span class="name">浜哄憳鍚嶇О</span>
+ </div>
+ </el-col>
+ <el-col :span="12">
+ <div class="grid-content bg-purple">浜哄憳ID</div>
+ </el-col>
- <!-- <el-col :span="5">
- <div class="grid-content bg-purple">鍦ㄥ簱鏁伴噺</div>
- </el-col> -->
- <el-col :span="3">
- <div class="grid-content bg-purple">鍗曚綅</div>
- </el-col>
+ <!-- <el-col :span="5">
+ <div class="grid-content bg-purple">鍦ㄥ簱鏁伴噺</div>
+ </el-col> -->
+ </template>
+ <template v-else>
+ <el-col :span="13">
+ <div class="grid-content bg-purple">
+ <span class="name">浜у搧鍚嶇О</span>
+ </div>
+ </el-col>
+ <el-col :span="8">
+ <div class="grid-content bg-purple">浜у搧缂栫爜</div>
+ </el-col>
+
+ <!-- <el-col :span="5">
+ <div class="grid-content bg-purple">鍦ㄥ簱鏁伴噺</div>
+ </el-col> -->
+ <el-col :span="3">
+ <div class="grid-content bg-purple">鍗曚綅</div>
+ </el-col>
+ </template>
</el-row>
</div>
<li class="empty" v-if="listData.length === 0">鏆傛棤鏁版嵁</li>
@@ -70,26 +86,45 @@
:class="selectValue == user.id ? 'highlight-color' : ''"
>
<el-row :gutter="0">
- <el-col :span="13">
- <div class="grid-content bg-purple" :title="user[obj.name]">
- {{ user[obj.name] || "--" }}
- </div>
- </el-col>
- <el-col :span="8">
- <div class="grid-content bg-purple" :title="user.id">
- <span class="name">{{ user.id || "--" }}</span>
- </div>
- </el-col>
- <!-- <el-col :span="6">
- <div class="grid-content bg-purple" :title="user.amount">
- {{ user.amount || "--" }}
- </div>
- </el-col> -->
- <el-col :span="3">
- <div class="grid-content bg-purple" :title="user.unit">
- {{ user.unit || "--" }}
- </div>
- </el-col>
+ <template v-if="request==2">
+ <el-col :span="12">
+ <div class="grid-content bg-purple" :title="user[obj.name]">
+ {{ user[obj.name] || "--" }}
+ </div>
+ </el-col>
+ <el-col :span="12">
+ <div class="grid-content bg-purple" :title="user.id">
+ <span class="name">{{ user.id || "--" }}</span>
+ </div>
+ </el-col>
+ <!-- <el-col :span="6">
+ <div class="grid-content bg-purple" :title="user.amount">
+ {{ user.amount || "--" }}
+ </div>
+ </el-col> -->
+ </template>
+ <template v-else>
+ <el-col :span="13">
+ <div class="grid-content bg-purple" :title="user[obj.name]">
+ {{ user[obj.name] || "--" }}
+ </div>
+ </el-col>
+ <el-col :span="8">
+ <div class="grid-content bg-purple" :title="user.id">
+ <span class="name">{{ user.id || "--" }}</span>
+ </div>
+ </el-col>
+ <!-- <el-col :span="6">
+ <div class="grid-content bg-purple" :title="user.amount">
+ {{ user.amount || "--" }}
+ </div>
+ </el-col> -->
+ <el-col :span="3">
+ <div class="grid-content bg-purple" :title="user.unit">
+ {{ user.unit || "--" }}
+ </div>
+ </el-col>
+ </template>
</el-row>
</li>
<li class="loading">{{ loading ? "鍔犺浇涓�" : "宸茬粡鍒板簳" }}</li>
@@ -103,7 +138,7 @@
</template>
<script>
-import { getProductList } from "@/api/product/product"
+import { getProductList,getPersonnelList } from "@/api/product/product"
// import DataSet from "@/views/ShopFloorControl/facilty/components/DataSet";
export default {
name: "UserSimpleSearchInput",
@@ -151,7 +186,8 @@
size: {
type: [String],
defalut: "medium"
- }
+ },
+
},
data() {
return {
@@ -203,10 +239,16 @@
name: "gaugeName",
id: "id"
}
+ }else if (val == 2) {
+ // 鍏朵粬鎼滅储閰嶇疆杩欓噷
+ this.obj = {
+ name: "name",
+ id: "id"
+ }
}
},
// 鏇存柊鎼滅储鍒楄〃
- updateSearchList(needInit = false, param = {}) {
+ async updateSearchList(needInit = false, param = {}) {
let listParams
// 鍒濆鍖栫敤鎴蜂俊鎭垪琛ㄥ叆鍙�
if (needInit) {
@@ -224,9 +266,30 @@
this.loading = true
if (this.request) {
// 鍏朵粬
+ // 浜哄憳
+ if (this.request == 2) {
+ //浜哄憳 request==1
+ listParams = {
+ condition: this.keyword,
+ page: this.page,
+ pageSize: this.pageSize,
+ ...param,
+ };
+ const res = await getPersonnelList(listParams);
+ if (res && res.code == "200" && res.data) {
+ this.loading = false;
+ this.page = res.page + 1;
+ this.count = res.total;
+ if (res.data && Array.isArray(res.data)) {
+ let arr = JSON.parse(JSON.stringify(res.data));
+ this.listData = this.listData.concat(arr);
+ }
+ this.num += 1;
+ }
+ }
} else {
// 浜у搧
- getProductList(listParams).then((res) => {
+ await getProductList(listParams).then((res) => {
if (res && res.code === 200 && res.data) {
this.loading = false
this.page = this.page + 1
diff --git a/src/components/makepager/TableCommonView.vue b/src/components/makepager/TableCommonView.vue
index 9bb4193..df44eff 100644
--- a/src/components/makepager/TableCommonView.vue
+++ b/src/components/makepager/TableCommonView.vue
@@ -308,7 +308,7 @@
right: 2px;
display: flex;
align-items: center;
- // z-index: 9999;
+ z-index: 9999;
.label {
position: absolute;
top: 6px;
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 7b32ed0..4f93016 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -8,9 +8,18 @@
>
<!-- 澶� -->
<div slot="title" class="dialog-header">
- <span>{{ editCommonConfig.title === "鏌ョ湅" ? editCommonConfig.title : editCommonConfig.title + addName }}</span>
+ <span>{{
+ editCommonConfig.title === "鏌ョ湅"
+ ? editCommonConfig.title
+ : editCommonConfig.title + addName
+ }}</span>
<div class="header_btns">
- <span class="btn" :style="{ cursor: thatCursor, color: thatColor }" @click="btnPrint" :disabled="true">
+ <span
+ class="btn"
+ :style="{ cursor: thatCursor, color: thatColor }"
+ @click="btnPrint"
+ :disabled="true"
+ >
<i class="el-icon-printer"></i>
<span>鎵撳嵃</span>
</span>
@@ -57,27 +66,48 @@
<el-row>
<el-col :span="12">
<el-form-item prop="number">
- <span slot="label">{{ workType === 1 ? "鍏ュ簱" : workType === 2 ? "鍑哄簱" : "璋冩嫧" }}鍗曞彿</span>
+ <span slot="label"
+ >{{
+ workType === 1
+ ? "鍏ュ簱"
+ : workType === 2
+ ? "鍑哄簱"
+ : "璋冩嫧"
+ }}鍗曞彿</span
+ >
<el-input
style="width: 85%"
v-if="
editConfig.title == '缂栬緫' ||
editConfig.title == '鏌ョ湅' ||
- (editConfig.title == '鏂板缓' && codenumer && (explain != '' || isIdDisabled))
+ (editConfig.title == '鏂板缓' &&
+ codenumer &&
+ (explain != '' || isIdDisabled))
"
:disabled="editConfig.title != '鏂板缓'"
v-model="editConfig.infomation.number"
placeholder="璇疯緭鍏ョ紪鐮�"
>
</el-input>
- <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c; width: 85%"
- >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
+ <span
+ v-else-if="editConfig.title == '鏂板缓'"
+ style="color: #f56c6c; width: 85%"
+ >璇蜂紭鍏堥厤缃紪鐮佽鑼�
+ <el-button type="text" @click="numberClick">
+ 閰嶇疆瑙勮寖
+ </el-button></span
>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="companyName">
- <span slot="label">{{ workType === 1 ? "渚涘簲鍟�" : workType === 2 ? "瀹㈡埛" : "鑱旂郴浜�" }}</span>
+ <span slot="label">{{
+ workType === 1
+ ? "渚涘簲鍟�"
+ : workType === 2
+ ? "瀹㈡埛"
+ : "鑱旂郴浜�"
+ }}</span>
<el-select
v-if="workType === 1"
@@ -92,7 +122,10 @@
v-for="item in supplierOptions"
:key="item.SupplierId"
:label="item.SupplierName"
- :value="{ value: item.SupplierId, label: item.SupplierName }"
+ :value="{
+ value: item.SupplierId,
+ label: item.SupplierName,
+ }"
>
</el-option>
</el-select>
@@ -182,14 +215,23 @@
style="width: 90%"
:disabled="!showFooter"
>
- <el-option v-for="item in operationTypeOptions" :key="item.id" :label="item.name" :value="item.id">
+ <el-option
+ v-for="item in operationTypeOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ >
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col v-else :span="12">
<el-form-item label="鍏ュ簱绫诲瀷">
- <el-input v-model="receiptType" disabled style="width: 90%"></el-input>
+ <el-input
+ v-model="receiptType"
+ disabled
+ style="width: 90%"
+ ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -203,7 +245,10 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item :label="workType === 1 ? '浠撳簱浣嶇疆' : '浠�'" prop="location">
+ <el-form-item
+ :label="workType === 1 ? '浠撳簱浣嶇疆' : '浠�'"
+ prop="location"
+ >
<el-select
@change="rootLocationChange"
v-model="editConfig.infomation.location"
@@ -262,6 +307,126 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="涓荤" prop="managerObj">
+ <!-- <SimpleSearchInput
+ style="width: 90%"
+ v-model="editConfig.infomation.manager"
+ :echoValue="editConfig.infomation.manager"
+ :echoName="editConfig.infomation.manager"
+ checkedNum="1"
+ :clearable="true"
+ request='2'
+ @select-user="setFormItem($event, 'manager', 'managerName')"
+ >
+ </SimpleSearchInput> -->
+ <el-select
+ v-model="editConfig.infomation.managerObj"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 90%"
+ :disabled="!showFooter"
+ filterable
+ @change="
+ (event) =>
+ personChange(
+ event,
+ 'manager',
+ 'managerId',
+ 'managerObj'
+ )
+ "
+ >
+ <el-option
+ v-for="item in personelOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="{ value: item.id, label: item.name }"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="浼氳" prop="accountantObj">
+ <!-- <SimpleSearchInput
+ style="width: 90%"
+ v-model="editConfig.infomation.accountant"
+ :echoValue="editConfig.infomation.accountant"
+ :echoName="editConfig.infomation.accountant"
+ checkedNum="1"
+ :clearable="true"
+ request='2'
+ @select-user="setFormItem($event, 'manager', 'accountantName')"
+ >
+ </SimpleSearchInput> -->
+ <el-select
+ v-model="editConfig.infomation.accountantObj"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 90%"
+ filterable
+ :disabled="!showFooter"
+ @change="
+ (event) =>
+ personChange(
+ event,
+ 'accountant',
+ 'accountantId',
+ 'accountantObj'
+ )
+ "
+ >
+ <el-option
+ v-for="item in personelOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="{ value: item.id, label: item.name }"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="淇濈鍛�" prop="custodianObj">
+ <!-- <SimpleSearchInput
+ style="width: 90%"
+ v-model="editConfig.infomation.custodian"
+ :echoValue="editConfig.infomation.custodian"
+ :echoName="editConfig.infomation.custodian"
+ checkedNum="1"
+ :clearable="true"
+ request='2'
+ @select-user="setFormItem($event, 'custodian', 'custodianName')"
+ >
+ </SimpleSearchInput> -->
+ <el-select
+ v-model="editConfig.infomation.custodianObj"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 90%"
+ filterable
+ :disabled="!showFooter"
+ @change="
+ (event) =>
+ personChange(
+ event,
+ 'custodian',
+ 'custodianId',
+ 'custodianObj'
+ )
+ "
+ >
+ <el-option
+ v-for="item in personelOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="{ value: item.id, label: item.name }"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
<!-- <el-col :span="12">
<el-form-item v-if="workType !== 1" label="閫佽揣绛栫暐" prop="client_name">
<el-select
@@ -294,7 +459,11 @@
<el-tabs v-model="activeName" type="card">
<!-- <el-tab-pane v-if="workType !== 1" label="璇︽儏" name="detail"> </el-tab-pane> -->
<el-tab-pane label="浜у搧" name="first"> </el-tab-pane>
- <el-tab-pane label="鐗╂祦淇℃伅" name="two" v-if="this.workType === 2"></el-tab-pane>
+ <el-tab-pane
+ label="鐗╂祦淇℃伅"
+ name="two"
+ v-if="this.workType === 2"
+ ></el-tab-pane>
</el-tabs>
<!-- 鎿嶄綔 -->
<div v-if="activeName === 'first'">
@@ -311,12 +480,22 @@
@clearupProduct="clearupProduct"
>
<template v-if="showFooter" slot="tableButton">
- <el-table-column label="鎿嶄綔" width="60" fixed="right" align="center">
+ <el-table-column
+ label="鎿嶄綔"
+ width="60"
+ fixed="right"
+ align="center"
+ >
<template slot-scope="scope">
<!-- <div @click="handleDelClick(scope, '鎿嶄綔')">
<i class="el-icon-delete"></i>
</div> -->
- <el-button type="text" size="small" @click.stop="handleDelClick(scope, '鎿嶄綔')">鍒犻櫎</el-button>
+ <el-button
+ type="text"
+ size="small"
+ @click.stop="handleDelClick(scope, '鎿嶄綔')"
+ >鍒犻櫎</el-button
+ >
</template>
</el-table-column>
</template>
@@ -435,15 +614,23 @@
<!-- 灏� -->
<div slot="footer" class="dialog-footer">
<!-- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆苟鎻愪氦瀹℃壒</el-button> -->
- <el-button type="primary" size="small" @click="saveClick" :disabled="!showFooter">淇濆瓨</el-button>
- <el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
+ <el-button
+ type="primary"
+ size="small"
+ @click="saveClick"
+ :disabled="!showFooter"
+ >淇濆瓨</el-button
+ >
+ <el-button size="small" @click="editConfig.visible = false"
+ >鍙栨秷</el-button
+ >
</div>
</el-dialog>
</div>
</template>
<script>
-import CommonFormTableView from "@/components/makepager/CommonFormTableView"
+import CommonFormTableView from "@/components/makepager/CommonFormTableView";
import {
getLocationList,
addOperation,
@@ -453,10 +640,16 @@
deleteOperation,
getListTransfer,
getLogisticCompanyList,
- printReceipts
-} from "@/api/overview/overview"
-import { getSupplierList, getCompanyList, getClientList } from "@/api/common/other"
-import codeMixin from "@/views/overview/mixin/codeMixin"
+ printReceipts,
+} from "@/api/overview/overview";
+import {
+ getSupplierList,
+ getCompanyList,
+ getClientList,
+} from "@/api/common/other";
+// import SimpleSearchInput from "@/components/makepager/SimpleSearchInput"
+import { getPersonnelList } from "@/api/product/product";
+import codeMixin from "@/views/overview/mixin/codeMixin";
export default {
name: "AddOverviewDialog",
mixins: [codeMixin],
@@ -468,54 +661,75 @@
visible: false,
title: "鏂板缓",
operationTypeId: 0,
- infomation: {}
- }
- }
+ infomation: {},
+ };
+ },
},
workType: {
type: Number,
default: function () {
// return JSON.parse(window.sessionStorage.getItem('paramsData')).workType|| 1;
- return 1
- }
+ return 1;
+ },
},
addName: {
type: String,
- default: "璋冩嫧"
+ default: "璋冩嫧",
},
showOperationType: {
type: Boolean,
- default: false
- }
+ default: false,
+ },
},
- components: { CommonFormTableView },
+ components: {
+ CommonFormTableView,
+ // SimpleSearchInput,
+ },
computed: {},
data() {
return {
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- sourceNumber: [{ required: true, message: "璇疯緭鍏ユ潵婧愬崟鎹�", trigger: "blur" }],
- operationDate: [{ required: true, message: "璇烽�夋嫨鏃ユ湡", trigger: "change" }],
- toLocation: [{ required: true, message: "璇烽�夋嫨浣嶇疆", trigger: "change" }],
- location: [{ required: true, message: "璇烽�夋嫨璋冨嚭浣嶇疆", trigger: "change" }],
- operationTypeId: [{ required: true, message: "璇烽�夋嫨鍏ュ簱绫诲瀷", trigger: "change" }],
- number: [{ required: true, validator: this.validateCheckCode, trigger: ["change", "blur"] }]
+ sourceNumber: [
+ { required: true, message: "璇疯緭鍏ユ潵婧愬崟鎹�", trigger: "blur" },
+ ],
+ operationDate: [
+ { required: true, message: "璇烽�夋嫨鏃ユ湡", trigger: "change" },
+ ],
+ toLocation: [
+ { required: true, message: "璇烽�夋嫨浣嶇疆", trigger: "change" },
+ ],
+ location: [
+ { required: true, message: "璇烽�夋嫨璋冨嚭浣嶇疆", trigger: "change" },
+ ],
+ operationTypeId: [
+ { required: true, message: "璇烽�夋嫨鍏ュ簱绫诲瀷", trigger: "change" },
+ ],
+ number: [
+ {
+ required: true,
+ validator: this.validateCheckCode,
+ trigger: ["change", "blur"],
+ },
+ ],
},
rules2: {
receiverPhone: [
// {required: true, message: "璇疯緭鍏ユ墜鏈哄彿", trigger: "change" },
{
- pattern: /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/,
+ pattern:
+ /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/,
message: "璇疯緭鍏ユ纭殑鎵嬫満鍙�",
- trigger: ["blur", "change"]
- }
- ]
+ trigger: ["blur", "change"],
+ },
+ ],
},
companyOptions: [], // 鍏徃
supplierOptions: [], //渚涘簲鍟�
clientOptions: [], //瀹㈡埛
memberOptions: [{ id: 1, name: "绠＄悊鍛�" }],
+ personelOptions: [],
formLocationOptions: [], // 鑷�
toLocationOptions: [], // 浠撳簱浣嶇疆
showButton: true,
@@ -544,46 +758,58 @@
waybillNumber: "",
weight: 0,
logisticWeight: 0,
- receiverPhone: ""
+ receiverPhone: "",
},
showCancel: false, // 鍙栨秷鏄惁鍙互鏄剧ず
list: [],
pdfParams: {},
thatCursor: this.workType === 3 ? "no-drop" : "pointer",
- thatColor: this.workType === 3 ? "#ccc" : "#000"
- }
+ thatColor: this.workType === 3 ? "#ccc" : "#000",
+ };
},
created() {
- this.getCompanyList()
- this.setStatusList()
- this.setTableForm()
- this.setBottonView()
- this.setDetailTableForm()
- this.getLocationList()
+ this.getCompanyList();
+ this.setStatusList();
+ this.setTableForm();
+ this.setBottonView();
+ this.setDetailTableForm();
+ this.getLocationList();
this.receiptType =
this.editConfig.title === "鏌ョ湅" || this.editConfig.title === "缂栬緫"
? this.editConfig.infomation.operationTypeName
- : this.addName
+ : this.addName;
if (this.showOperationType) {
- this.getListTransfer()
+ this.getListTransfer();
}
- this.getLogisticCompanyList()
- this.formInfo()
+ this.getLogisticCompanyList();
+ this.formInfo();
if (this.editConfig.title === "鏌ョ湅" || this.editConfig.title === "缂栬緫") {
setTimeout(() => {
- this.$refs.tableView.setLocationList(this.editConfig.infomation.location.label)
- }, 100)
+ this.$refs.tableView.setLocationList(
+ this.editConfig.infomation.location.label
+ );
+ }, 100);
}
},
mounted() {},
methods: {
+ setFormItem(val, itemMark, itemName) {
+ console.log(val, "===val");
+ this.editConfig.infomation[itemMark] = val.id;
+ this.editConfig.infomation[itemName] = val.name;
+ },
formInfo() {
- this.objCode.type = this.workType === 1 ? "鍏ュ簱缂栫爜" : this.workType === 2 ? "鍑哄簱缂栫爜" : "璋冩嫧缂栫爜"
- this.objCode.codeStandID = ""
+ this.objCode.type =
+ this.workType === 1
+ ? "鍏ュ簱缂栫爜"
+ : this.workType === 2
+ ? "鍑哄簱缂栫爜"
+ : "璋冩嫧缂栫爜";
+ this.objCode.codeStandID = "";
if (this.editConfig.infomation.codeStandardID) {
- this.objCode.codeStandID = this.editConfig.infomation.codeStandardID
+ this.objCode.codeStandID = this.editConfig.infomation.codeStandardID;
}
- this.getRCodeStandardList()
+ this.getRCodeStandardList();
},
setStatusList() {
if (this.editConfig.infomation.status === 5) {
@@ -592,41 +818,51 @@
{ label: "姝ｅ湪绛夊緟", status: "todo", value: 2 },
{ label: "灏辩华", status: "todo", value: 3 },
{ label: "瀹屾垚", status: "todo", value: 4 },
- { label: "宸插彇娑�", status: "todo", value: 5 }
- ]
+ { label: "宸插彇娑�", status: "todo", value: 5 },
+ ];
} else {
this.list = [
{ label: "鑽夌", status: "todo", value: 1 },
{ label: "姝ｅ湪绛夊緟", status: "todo", value: 2 },
{ label: "灏辩华", status: "todo", value: 3 },
- { label: "瀹屾垚", status: "todo", value: 4 }
- ]
+ { label: "瀹屾垚", status: "todo", value: 4 },
+ ];
}
},
// 鑾峰彇鍏徃鍒楄〃
async getCompanyList() {
+ await getPersonnelList().then((res) => {
+ if (res.code === 200) {
+ this.personelOptions = res.data;
+ }
+ });
if (this.workType === 1) {
await getSupplierList().then((res) => {
- console.log(res)
+ console.log(res);
if (res.code === 200) {
- this.supplierOptions = res.data
+ this.supplierOptions = res.data;
}
- })
+ });
} else if (this.workType === 2) {
await getClientList().then((res) => {
- console.log(res)
+ console.log(res);
if (res.code === 200) {
- this.clientOptions = res.data
+ this.clientOptions = res.data;
}
- })
+ });
} else {
await getCompanyList().then((res) => {
- console.log(res)
+ console.log(res);
if (res.code === 200) {
- this.companyOptions = res.data
+ this.companyOptions = res.data;
}
- })
+ });
}
+ },
+ personChange(val, name, id, obj) {
+ this.editConfig.infomation[obj] = val;
+ this.editConfig.infomation[name] = val.label;
+ this.editConfig.infomation[id] = val.value;
},
// 鑾峰彇璋冨嚭浣嶇疆/浠撳簱浣嶇疆鍒楄〃
async getLocationList() {
@@ -634,150 +870,160 @@
keyWord: "",
jointName: this.editConfig.code,
page: 0,
- pageSize: 0
+ pageSize: 0,
}).then((res) => {
- console.log(res)
+ console.log(res);
if (res.code === 200) {
- this.formLocationOptions = res.data
+ this.formLocationOptions = res.data;
}
- })
+ });
await getLocationList({
keyWord: "",
// jointName: this.editConfig.code,
page: 0,
- pageSize: 0
+ pageSize: 0,
}).then((res) => {
- console.log(res)
+ console.log(res);
if (res.code === 200) {
- this.toLocationOptions = res.data
+ this.toLocationOptions = res.data;
}
- })
+ });
},
// 鑾峰彇浠撳簱绫诲瀷
async getListTransfer() {
await getListTransfer({
keyword: "",
page: 0,
- pageSize: 0
+ pageSize: 0,
}).then((res) => {
- console.log(res.data)
+ console.log(res.data);
if (res.code === 200) {
const list = res.data.map((item) => {
return {
name: item.name,
- id: item.id
- }
- })
- this.operationTypeOptions = list || []
+ id: item.id,
+ };
+ });
+ this.operationTypeOptions = list || [];
}
- })
+ });
},
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
setBottonView() {
- console.log(this.editConfig.infomation.status)
+ console.log(this.editConfig.infomation.status);
if (this.editConfig.title === "鏂板缓") {
- this.showButton = false
- this.showEdit = false
- this.showFooter = true
- this.isValidateClick = false
+ this.showButton = false;
+ this.showEdit = false;
+ this.showFooter = true;
+ this.isValidateClick = false;
} else if (this.editConfig.title === "缂栬緫") {
- this.showButton = true
- this.showEdit = false
- this.isDelClick = true
- this.showFooter = true
- } else if (this.editConfig.title === "鏌ョ湅" && this.editConfig.infomation.status !== 4) {
- this.showButton = true
- this.showEdit = true
- this.isDelClick = true
- this.showFooter = false
+ this.showButton = true;
+ this.showEdit = false;
+ this.isDelClick = true;
+ this.showFooter = true;
+ } else if (
+ this.editConfig.title === "鏌ョ湅" &&
+ this.editConfig.infomation.status !== 4
+ ) {
+ this.showButton = true;
+ this.showEdit = true;
+ this.isDelClick = true;
+ this.showFooter = false;
if (this.editConfig.infomation.status === "瀹屾垚") {
- this.isValidateClick = false
+ this.isValidateClick = false;
} else if (this.editConfig.infomation.status === 3) {
- this.isValidateClick = true
- this.showCancel = true
+ this.isValidateClick = true;
+ this.showCancel = true;
} else if (this.editConfig.infomation.status === 5) {
- this.isCancel = true
- this.isValidateClick = true
+ this.isCancel = true;
+ this.isValidateClick = true;
} else {
- this.isValidateClick = true
+ this.isValidateClick = true;
}
- } else if (this.editConfig.infomation.status === 4 || this.editConfig.infomation.status === "瀹屾垚") {
- this.showButton = true
- this.showEdit = false
- this.isDelClick = true
- this.showFooter = false
- this.isValidateClick = false
+ } else if (
+ this.editConfig.infomation.status === 4 ||
+ this.editConfig.infomation.status === "瀹屾垚"
+ ) {
+ this.showButton = true;
+ this.showEdit = false;
+ this.isDelClick = true;
+ this.showFooter = false;
+ this.isValidateClick = false;
} else if (this.editConfig.infomation.status === 5) {
- this.isCancel = true
- this.showButton = true
- this.showEdit = false
- this.showFooter = false
- this.isValidateClick = false
+ this.isCancel = true;
+ this.showButton = true;
+ this.showEdit = false;
+ this.showFooter = false;
+ this.isValidateClick = false;
} else {
// 灏辩华---
- this.showButton = true
- this.showEdit = true
- this.showFooter = false
- this.isValidateClick = true
- this.showCancel = true
+ this.showButton = true;
+ this.showEdit = true;
+ this.showFooter = false;
+ this.isValidateClick = true;
+ this.showCancel = true;
}
if (this.editConfig.title === "鏂板缓") {
- this.list[0].status = "active"
+ this.list[0].status = "active";
} else {
this.list.map((item) => {
- console.log(item, this.editConfig.infomation.status, "鎵撳嵃淇℃伅")
- if (item.value === this.editConfig.infomation.status || item.label === this.editConfig.infomation.status) {
- item.status = "active"
+ console.log(item, this.editConfig.infomation.status, "鎵撳嵃淇℃伅");
+ if (
+ item.value === this.editConfig.infomation.status ||
+ item.label === this.editConfig.infomation.status
+ ) {
+ item.status = "active";
} else {
- item.status = "todo"
+ item.status = "todo";
}
- })
+ });
}
},
// 鍏抽棴
handleClose() {
- this.editConfig.visible = false
+ this.editConfig.visible = false;
},
// 缂栬緫
editClick() {
- this.showEdit = false
- this.showButton = false
- this.showFooter = true
- this.setTableForm()
+ this.showEdit = false;
+ this.showButton = false;
+ this.showFooter = true;
+ this.setTableForm();
},
async getLogisticCompanyList() {
await getLogisticCompanyList().then((res) => {
if (res.code === 200) {
- this.editConfig.infomation.carrier = res.data
+ this.editConfig.infomation.carrier = res.data;
}
- })
+ });
},
// 淇濆瓨
saveClick() {
- let validArr = []
+ let validArr = [];
if (this.workType === 2) {
- console.log("鍑哄簱")
- validArr = [this.$refs.form.validate()]
+ console.log("鍑哄簱");
+ validArr = [this.$refs.form.validate()];
} else {
- console.log("鍏ュ簱")
- validArr = [this.$refs.form.validate()]
+ console.log("鍏ュ簱");
+ validArr = [this.$refs.form.validate()];
}
- console.log(validArr, "xxx")
+ console.log(validArr, "xxx");
Promise.all(validArr)
.then((results) => {
- console.log(results, "鎵ц鎴愬姛", this.tableData)
+ console.log(results, "鎵ц鎴愬姛", this.tableData);
for (let i = 0; i < this.tableData.length; i++) {
if (this.tableData[i].productName.length === 0) {
- this.isNoProduct = true
- break
+ this.isNoProduct = true;
+ break;
} else {
- this.isNoProduct = false
+ this.isNoProduct = false;
}
}
if (this.isNoProduct) {
- this.$message.error("璇锋坊鍔犳槑缁嗚鎴栭�夋嫨浜у搧涓嶈兘涓虹┖")
+ this.$message.error("璇锋坊鍔犳槑缁嗚鎴栭�夋嫨浜у搧涓嶈兘涓虹┖");
} else {
- let params = this.saveParams()
+ let params = this.saveParams();
+ let isContinue=false;
// if(this.workType===2){
// params.details.map((item)=>{
// item.fromLocationId=item.fromLocationId.value
@@ -789,17 +1035,20 @@
// })
// }
// 浜у搧鍒楄〃瑙ｆ瀯
- if (this.editConfig.title === "缂栬緫" || this.editConfig.title === "鏌ョ湅") {
- let arr = []
+ if (
+ this.editConfig.title === "缂栬緫" ||
+ this.editConfig.title === "鏌ョ湅"
+ ) {
+ let arr = [];
if (this.workType === 1) {
params.details.map((item) => {
arr.push({
operationId: item.operationId,
amount: item.amount,
- productId: item.productId
- })
- })
- params.details = arr
+ productId: item.productId,
+ });
+ });
+ params.details = arr;
} else if (this.workType === 2) {
params.details.map((item) => {
if (item.fromLocationId.value) {
@@ -807,28 +1056,32 @@
operationId: item.operationId,
amount: item.amount,
fromLocationId: item.fromLocationId.value,
- productId: item.productId
- })
+ productId: item.productId,
+ });
} else {
arr.push({
operationId: item.operationId,
amount: item.amount,
fromLocationId: item.fromLocation.id,
- productId: item.productId
- })
+ productId: item.productId,
+ });
}
- })
- params.details = arr
+ });
+ params.details = arr;
} else if (this.workType === 3) {
- console.log(params.details, "鐪嬬湅")
+ console.log(params.details, "鐪嬬湅");
params.details.map((item) => {
arr.push({
operationId: item.operationId,
amount: item.amount,
- fromLocationId: item.fromLocationId.value ? item.fromLocationId.value : item.fromLocation.id,
- toLocationId: item.toLocationId.value ? item.toLocationId.value : item.toLocation.id,
- productId: item.productId
- })
+ fromLocationId: item.fromLocationId.value
+ ? item.fromLocationId.value
+ : item.fromLocation.id,
+ toLocationId: item.toLocationId.value
+ ? item.toLocationId.value
+ : item.toLocation.id,
+ productId: item.productId,
+ });
// if(item.fromLocationId.value){
// arr.push({
// operationId:item.operationId,
@@ -846,62 +1099,95 @@
// productId:item.productId,
// })
// }
- })
- params.details = arr
+ });
+ params.details = arr;
}
} else if (this.editConfig.title === "鏂板缓") {
+
if (this.workType === 2) {
params.details.map((item) => {
- item.fromLocationId = item.fromLocationId.value
- })
+ item.fromLocationId = item.fromLocationId.value;
+ });
} else if (this.workType === 3) {
+
params.details.map((item) => {
- item.fromLocationId = item.fromLocationId.value
- item.toLocationId = item.toLocationId.value
- })
+ if(!item.fromLocationId||!item.toLocationId){
+ isContinue=true
+ return true
+ }
+ item.fromLocationId = item.fromLocationId.value;
+ item.toLocationId = item.toLocationId.value;
+ });
+ }
+ if(isContinue){
+ this.$message.error('璇峰～鍐欏畬鎴愯〃鏍硷紒')
+ return true;
}
}
- let requestUrl = this.editConfig.title === "鏂板缓" ? addOperation : updateOperation
+ let requestUrl =
+ this.editConfig.title === "鏂板缓" ? addOperation : updateOperation;
// let params = this.saveParams()
requestUrl({
- ...params
+ ...params,
}).then((res) => {
- this.editConfig.visible = false
+ this.editConfig.visible = false;
if (res.code === 200) {
if (this.editConfig.title === "鏂板缓") {
- this.$message.success("娣诲姞鎴愬姛")
+ this.$message.success("娣诲姞鎴愬姛");
} else {
- this.$message.success("缂栬緫鎴愬姛")
+ this.$message.success("缂栬緫鎴愬姛");
}
- this.$parent.getData()
+ this.$parent.getData();
} else {
- this.$message.success(res.msg)
+ this.$message.success(res.msg);
}
- })
+ });
}
})
.catch((error) => {
- console.error("琛ㄥ崟鏍￠獙鏈�氳繃:", error)
- })
+ console.error("琛ㄥ崟鏍￠獙鏈�氳繃:", error);
+ });
},
saveParams() {
- let data = this.editConfig.infomation
- let companyID = 0
- let companyName = ""
- let contacterID = 0
- let contacterName = ""
+ let data = this.editConfig.infomation;
+ let companyID = 0;
+ let companyName = "";
+ let contacterID = 0;
+ let contacterName = "";
if (this.editConfig.title === "鏂板缓") {
- companyID = Object.keys(this.companyObj).length === 0 ? 0 : this.companyObj.value
- companyName = Object.keys(this.companyObj).length === 0 ? "" : this.companyObj.label
- contacterID = Object.keys(this.contacterObj).length === 0 ? 0 : this.contacterObj.value
- contacterName = Object.keys(this.contacterObj).length === 0 ? "" : this.contacterObj.label
+ companyID =
+ Object.keys(this.companyObj).length === 0 ? 0 : this.companyObj.value;
+ companyName =
+ Object.keys(this.companyObj).length === 0
+ ? ""
+ : this.companyObj.label;
+ contacterID =
+ Object.keys(this.contacterObj).length === 0
+ ? 0
+ : this.contacterObj.value;
+ contacterName =
+ Object.keys(this.contacterObj).length === 0
+ ? ""
+ : this.contacterObj.label;
} else {
- companyID = Object.keys(this.companyObj).length === 0 ? data.companyID : this.companyObj.value
- companyName = Object.keys(this.companyObj).length === 0 ? data.companyName : this.companyObj.label
- contacterID = Object.keys(this.contacterObj).length === 0 ? data.contacterID : this.contacterObj.value
- contacterName = Object.keys(this.contacterObj).length === 0 ? data.contacterName : this.contacterObj.label
+ companyID =
+ Object.keys(this.companyObj).length === 0
+ ? data.companyID
+ : this.companyObj.value;
+ companyName =
+ Object.keys(this.companyObj).length === 0
+ ? data.companyName
+ : this.companyObj.label;
+ contacterID =
+ Object.keys(this.contacterObj).length === 0
+ ? data.contacterID
+ : this.contacterObj.value;
+ contacterName =
+ Object.keys(this.contacterObj).length === 0
+ ? data.contacterName
+ : this.contacterObj.label;
}
- let params = {}
+ let params = {};
if (this.workType === 1 || this.workType === 2) {
params = {
baseOperationType: data.baseOperationType,
@@ -915,7 +1201,9 @@
id: data.id,
number: data.number || "",
operationDate: data.operationDate || "",
- operationTypeId: this.showOperationType ? data.operationTypeId : this.editConfig.operationTypeId,
+ operationTypeId: this.showOperationType
+ ? data.operationTypeId
+ : this.editConfig.operationTypeId,
operationTypeName: this.receiptType,
sourceNumber: data.sourceNumber || "",
status: 3,
@@ -926,8 +1214,14 @@
logisticCompanyId: data.logisticCompanyId,
receiverAddr: data.receiverAddr || "",
receiverName: data.receiverName || "",
- receiverPhone: data.receiverPhone || ""
- }
+ receiverPhone: data.receiverPhone || "",
+ manager: data.manager || "",
+ managerId: data.managerId || "",
+ accountant: data.accountant || "",
+ accountantId: data.accountantId || "",
+ custodian: data.custodian || "",
+ custodianId: data.custodianId || "",
+ };
} else if (this.workType === 3) {
params = {
baseOperationType: data.baseOperationType,
@@ -941,7 +1235,9 @@
id: data.id,
number: data.number || "",
operationDate: data.operationDate || "",
- operationTypeId: this.showOperationType ? data.operationTypeId : this.editConfig.operationTypeId,
+ operationTypeId: this.showOperationType
+ ? data.operationTypeId
+ : this.editConfig.operationTypeId,
operationTypeName: this.receiptType,
sourceNumber: data.sourceNumber || "",
status: 3,
@@ -952,21 +1248,27 @@
logisticCompanyId: data.logisticCompanyId,
receiverAddr: data.receiverAddr || "",
receiverName: data.receiverName || "",
- receiverPhone: data.receiverPhone || ""
- }
+ receiverPhone: data.receiverPhone || "",
+ manager: data.manager || "",
+ managerId: data.managerId || "",
+ accountant: data.accountant || "",
+ accountantId: data.accountantId || "",
+ custodian: data.custodian || "",
+ custodianId: data.custodianId || "",
+ };
}
- return params
+ return params;
},
// 鍒犻櫎
async delClick() {
await deleteOperation(this.editConfig.infomation.id).then((res) => {
- console.log(res)
- this.editConfig.visible = false
+ console.log(res);
+ this.editConfig.visible = false;
if (res.code === 200) {
- this.$message.success("鍒犻櫎鎴愬姛")
- this.$parent.getData()
+ this.$message.success("鍒犻櫎鎴愬姛");
+ this.$parent.getData();
}
- })
+ });
},
// 鎿嶄綔鍒楄〃
setTableForm() {
@@ -980,85 +1282,145 @@
...item,
productName: item.product.name,
productId: item.product.id,
- unit: item.product.unit
- }
- })
- this.tableData = list
+ unit: item.product.unit,
+ };
+ });
+ this.tableData = list;
} else {
- this.tableData = []
+ this.tableData = [];
}
// this.tableData = this.editConfig.title !== "鏂板缓" ? list : []
- let tableColumnArr = []
+ let tableColumnArr = [];
if (this.workType === 1) {
tableColumnArr = [
- { label: "浜у搧鍚嶇О", prop: "productName", productName: true, isRequird: true },
+ {
+ label: "浜у搧鍚嶇О",
+ prop: "productName",
+ productName: true,
+ isRequird: true,
+ },
{ label: "浜у搧缂栫爜", prop: "productId" },
{ label: "鏁伴噺", prop: "amount", inputFloat: true },
{ label: "浜у搧瑙勬牸", prop: "specs" },
{ label: "浜у搧鍨嬪彿", prop: "model" },
{ label: "璁￠噺鍗曚綅", prop: "unit" },
- ]
+ ];
} else if (this.workType === 2) {
tableColumnArr = [
- { label: "浜у搧鍚嶇О", prop: "productName", productName: true, isRequird: true },
+ {
+ label: "浜у搧鍚嶇О",
+ prop: "productName",
+ productName: true,
+ isRequird: true,
+ },
{ label: "浜у搧缂栫爜", prop: "productId" },
{ label: "鏁伴噺", prop: "amount", inputFloat: true },
{ label: "浜у搧瑙勬牸", prop: "specs" },
{ label: "浜у搧鍨嬪彿", prop: "model" },
- { label: "浠�", prop: "fromLocationId", sonLocation: true, isRequird: true },
+ {
+ label: "浠�",
+ prop: "fromLocationId",
+ sonLocation: true,
+ isRequird: true,
+ },
{ label: "璁￠噺鍗曚綅", prop: "unit" },
- ]
+ ];
} else if (this.workType === 3) {
tableColumnArr = [
- { label: "浜у搧鍚嶇О", prop: "productName", productName: true, isRequird: true },
+ {
+ label: "浜у搧鍚嶇О",
+ prop: "productName",
+ productName: true,
+ isRequird: true,
+ },
{ label: "浜у搧缂栫爜", prop: "productId" },
{ label: "鏁伴噺", prop: "amount", inputFloat: true },
{ label: "浜у搧瑙勬牸", prop: "specs" },
{ label: "浜у搧鍨嬪彿", prop: "model" },
- { label: "浠�", prop: "fromLocationId", sonLocation: true, isRequird: true },
- { label: "鑷�", prop: "toLocationId", toLocation: true, isRequird: true },
+ {
+ label: "浠�",
+ prop: "fromLocationId",
+ sonLocation: true,
+ isRequird: true,
+ },
+ {
+ label: "鑷�",
+ prop: "toLocationId",
+ toLocation: true,
+ isRequird: true,
+ },
{ label: "璁￠噺鍗曚綅", prop: "unit" },
- ]
- }else if (this.workType === 4) {
+ ];
+ } else if (this.workType === 4) {
tableColumnArr = [
- { label: "浜у搧鍚嶇О", prop: "productName", productName: true, isRequird: true },
+ {
+ label: "浜у搧鍚嶇О",
+ prop: "productName",
+ productName: true,
+ isRequird: true,
+ },
{ label: "浜у搧缂栫爜", prop: "productId" },
{ label: "鏁伴噺", prop: "amount", inputFloat: true },
{ label: "浜у搧瑙勬牸", prop: "specs" },
{ label: "浜у搧鍨嬪彿", prop: "model" },
- { label: "浠�", prop: "fromLocationId", sonLocation: true, isRequird: true },
- { label: "鑷�", prop: "toLocationId", toLocation: true, isRequird: true },
+ {
+ label: "浠�",
+ prop: "fromLocationId",
+ sonLocation: true,
+ isRequird: true,
+ },
+ {
+ label: "鑷�",
+ prop: "toLocationId",
+ toLocation: true,
+ isRequird: true,
+ },
{ label: "璁￠噺鍗曚綅", prop: "unit" },
- ]
- }else if (this.workType === 5) {
+ ];
+ } else if (this.workType === 5) {
tableColumnArr = [
- { label: "浜у搧鍚嶇О", prop: "productName", productName: true, isRequird: true },
+ {
+ label: "浜у搧鍚嶇О",
+ prop: "productName",
+ productName: true,
+ isRequird: true,
+ },
{ label: "浜у搧缂栫爜", prop: "productId" },
{ label: "鏁伴噺", prop: "amount", inputFloat: true },
{ label: "浜у搧瑙勬牸", prop: "specs" },
{ label: "浜у搧鍨嬪彿", prop: "model" },
- { label: "浠�", prop: "fromLocationId", sonLocation: true, isRequird: true },
- { label: "鑷�", prop: "toLocationId", toLocation: true, isRequird: true },
+ {
+ label: "浠�",
+ prop: "fromLocationId",
+ sonLocation: true,
+ isRequird: true,
+ },
+ {
+ label: "鑷�",
+ prop: "toLocationId",
+ toLocation: true,
+ isRequird: true,
+ },
{ label: "璁￠噺鍗曚綅", prop: "unit" },
- ]
+ ];
}
this.productTableList = {
tableData: this.tableData,
- tableColumn: tableColumnArr
- }
+ tableColumn: tableColumnArr,
+ };
},
// 鎿嶄綔杈撳叆
inputContent(val, prop, row) {
- this.countId = row.countId
+ this.countId = row.countId;
this.tableData.map((item) => {
if (item.id === row.id) {
- item[prop] = val
+ item[prop] = val;
}
- })
+ });
},
// 鏂板
addProductClick(value) {
- console.log(value)
+ console.log(value);
// if (value === "鎿嶄綔") {
// console.log(this.tableData)
// for (let i = 0; i < this.tableData.length; i++) {
@@ -1107,55 +1469,55 @@
// 鏂板鏂瑰紡淇敼
getSelectArray(val, index) {
if (this.tableData.length == 1 && this.tableData[0].number.length == 0) {
- this.tableData = []
+ this.tableData = [];
}
if (index < this.tableData.length) {
- this.tableData.splice(index, 1)
+ this.tableData.splice(index, 1);
val.map((item, ind) => {
- this.tableData.splice(index + ind, 0, item)
- })
+ this.tableData.splice(index + ind, 0, item);
+ });
} else {
- this.tableData = this.tableData.concat(val)
+ this.tableData = this.tableData.concat(val);
}
- console.log(this.tableData)
+ console.log(this.tableData);
let list = this.tableData.map((res) => {
return {
...res,
amount: 1,
productName: res.name,
- productId: res.id
- }
- })
- this.tableData = list
- this.productTableList.tableData = list
+ productId: res.id,
+ };
+ });
+ this.tableData = list;
+ this.productTableList.tableData = list;
// this.showSummary.show = true
},
// 浜у搧娓呯┖
emptyProductClick() {
- this.tableData = []
- this.productTableList.tableData = this.tableData
+ this.tableData = [];
+ this.productTableList.tableData = this.tableData;
},
clearupProduct(data) {
- this.tableData = data
- this.productTableList.tableData = this.tableData
+ this.tableData = data;
+ this.productTableList.tableData = this.tableData;
},
// 鍒犻櫎
handleDelClick(scope, value) {
if (value === "鎿嶄綔") {
- this.tableData.splice(scope.$index, 1)
- this.productTableList.tableData = this.tableData
- this.$message.success("鍒犻櫎鎴愬姛锛�")
+ this.tableData.splice(scope.$index, 1);
+ this.productTableList.tableData = this.tableData;
+ this.$message.success("鍒犻櫎鎴愬姛锛�");
} else {
- this.detailTableData.splice(scope.$index, 1)
+ this.detailTableData.splice(scope.$index, 1);
}
},
// 璇︽儏鍒楄〃
setDetailTableForm() {
- this.setTableColumn()
+ this.setTableColumn();
this.detailTableList = {
tableData: this.detailTableData,
- tableColumn: this.tableColumn
- }
+ tableColumn: this.tableColumn,
+ };
},
setTableColumn() {
if (this.workType === "鍐呴儴璋冩嫧") {
@@ -1164,45 +1526,45 @@
{ label: "浠�", prop: "number", select: true },
{ label: "鑷�", prop: "amount", select: true },
{ label: "瀹屾垚", prop: "total", inputFloat: true },
- { label: "璁￠噺鍗曚綅", prop: "total", select: true }
- ]
+ { label: "璁￠噺鍗曚綅", prop: "total", select: true },
+ ];
} else {
this.tableColumn = [
{ label: "浜у搧", prop: "name", productName: true, isRequird: true },
{ label: "浠�", prop: "number", select: true },
{ label: "瀹屾垚", prop: "total", inputFloat: true },
- { label: "璁￠噺鍗曚綅", prop: "total", select: true }
- ]
+ { label: "璁￠噺鍗曚綅", prop: "total", select: true },
+ ];
}
},
// 璇︽儏杈撳叆
inputDetail(val, prop, row) {
- this.detailId = row.detailId
+ this.detailId = row.detailId;
this.detailTableData.map((item) => {
if (item.detailId === row.detailId) {
- item[prop] = val
+ item[prop] = val;
}
- })
+ });
},
// 瀹㈡埛閫夋嫨
companyChange(val) {
- console.log(val)
- this.companyObj = val
+ console.log(val);
+ this.companyObj = val;
},
// 璐熻矗浜洪�夋嫨
contacterChange(val) {
- this.contacterObj = val
+ this.contacterObj = val;
},
// 楠岃瘉
async validateClick() {
await updateStatus(this.editConfig.infomation.id).then((res) => {
- console.log(res)
- this.editConfig.visible = false
+ console.log(res);
+ this.editConfig.visible = false;
if (res.code === 200) {
- this.$message.success("楠岃瘉鎴愬姛")
- this.$parent.getData()
+ this.$message.success("楠岃瘉鎴愬姛");
+ this.$parent.getData();
}
- })
+ });
},
// 鍙栨秷
@@ -1210,71 +1572,75 @@
this.$confirm("纭畾鍙栨秷鍚楋紵", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
- type: "warning"
+ type: "warning",
})
.then(() => {
stateCancel(this.editConfig.infomation.id).then((res) => {
- console.log(res)
- this.editConfig.visible = false
+ console.log(res);
+ this.editConfig.visible = false;
if (res.code === 200) {
- this.$message.success("鍙栨秷璋冩嫧")
- this.$parent.getData()
+ this.$message.success("鍙栨秷璋冩嫧");
+ this.$parent.getData();
}
- })
+ });
this.list.map((item) => {
if (item.label === "宸插彇娑�") {
- item.status = "active"
+ item.status = "active";
} else {
- item.status = "todo"
+ item.status = "todo";
}
- })
+ });
})
- .catch(() => {})
+ .catch(() => {});
},
//鎵撳嵃
async btnPrint() {
if (this.workType !== 3) {
- localStorage.removeItem("pdfParams")
+ localStorage.removeItem("pdfParams");
try {
- let res = await printReceipts(this.editCommonConfig.infomation.id)
- console.log(res)
+ let res = await printReceipts(this.editCommonConfig.infomation.id);
+ console.log(res);
if (res.code === 200) {
- console.log(this.editConfig.infomation.baseOperationType, "绫诲瀷")
+ console.log(this.editConfig.infomation.baseOperationType, "绫诲瀷");
let pdfParams = {
url: res.data,
- baseOperationType: this.editConfig.infomation.baseOperationType || undefined,
- cutAfterWidth: this.editConfig.infomation.baseOperationType === 2 ? 50.8 : 53.3
- }
+ baseOperationType:
+ this.editConfig.infomation.baseOperationType || undefined,
+ cutAfterWidth:
+ this.editConfig.infomation.baseOperationType === 2
+ ? 50.8
+ : 53.3,
+ };
var { href } = this.$router.resolve({
path: "/overview/previewExcel",
query: {
- ...pdfParams
- }
- })
- window.open(href, "_blank")
+ ...pdfParams,
+ },
+ });
+ window.open(href, "_blank");
}
} catch (error) {
- console.error(error)
+ console.error(error);
}
}
},
// 璋冨嚭浣嶇疆閫夋嫨
rootLocationChange(val) {
- this.editConfig.infomation.location = val
+ this.editConfig.infomation.location = val;
// this.productTableList.tableData.map((item)=>{
// console.log(item,"item")
// // item.toLocationId={}
// // item.fromLocationId={}
// })
- this.$refs.tableView.setLocationList(val.label, "fromLocation")
+ this.$refs.tableView.setLocationList(val.label, "fromLocation");
},
// 浠撳簱浣嶇疆閫夋嫨
toLocationChange(val) {
- this.editConfig.infomation.toLocation = val
- this.$refs.tableView.setLocationList(val.label, "toLocation")
- }
- }
-}
+ this.editConfig.infomation.toLocation = val;
+ this.$refs.tableView.setLocationList(val.label, "toLocation");
+ },
+ },
+};
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index 1811b59..fef9531 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -97,7 +97,7 @@
data() {
return {
tableList: {},
- showcol: ["浠撳簱浣嶇疆", "鏉ユ簮","鏉ユ簮鍗曟嵁","璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鑱旂郴浜�", "鏃ユ湡", "閿�鍞槑缁嗗崟", "鐘舵��"],
+ showcol: ["浠撳簱浣嶇疆", "鏉ユ簮","鏉ユ簮鍗曟嵁","璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鑱旂郴浜�", "鏃ユ湡", "閿�鍞槑缁嗗崟", "鐘舵��" ,"涓荤","浼氳","淇濈鍛�",],
searchOptions: [],
commonDetail: {
visible: false,
@@ -120,7 +120,7 @@
numberLabel: "鍗曞彿",
TabsIndex: "0",
productTableList: {},
- showBottomCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "浜у搧瑙勬牸", "浜у搧鍨嬪彿", "璁￠噺鍗曚綅", "璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鏁伴噺"],
+ showBottomCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "浜у搧瑙勬牸", "浜у搧鍨嬪彿", "璁￠噺鍗曚綅", "璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鏁伴噺","涓荤","浼氳","淇濈鍛�",],
tableBottomColumn: [],
selectRow: {},
productColumn: [
@@ -175,7 +175,7 @@
this.toLabel = "瀹㈡埛浣嶇疆"
this.numberLabel = "鍑哄簱鍗曞彿"
} else {
- this.showcol=["浠撳簱浣嶇疆", "璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鑱旂郴浜�", "鏃ユ湡", "閿�鍞槑缁嗗崟", "鐘舵��"],
+ this.showcol=["浠撳簱浣嶇疆", "璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鑱旂郴浜�","鏃ユ湡", "閿�鍞槑缁嗗崟", "鐘舵��","涓荤","浼氳","淇濈鍛�",],
this.formLabel = "璋冨嚭浣嶇疆"
this.toLabel = "璋冨叆浣嶇疆"
this.numberLabel = "璋冩嫧鍗曞彿"
@@ -288,7 +288,25 @@
status: true,
isCallMethod: true,
getCallMethod: this.getStatus
- }
+ },
+ {
+ label: "涓荤",
+ prop: "manager",
+ isShowColumn: showcol.includes("涓荤"),
+ default: false
+ },
+ {
+ label: "浼氳",
+ prop: "accountant",
+ isShowColumn: showcol.includes("浼氳"),
+ default: false
+ },
+ {
+ label: "淇濈鍛�",
+ prop: "custodian",
+ isShowColumn: showcol.includes("淇濈鍛�"),
+ default: false
+ },
]
return tableColumn
},
@@ -369,7 +387,18 @@
}
row.locationID = row.location.jointName
row.locationId = row.location.value
-
+ row.managerObj={
+ label:row.manager,
+ value:row.managerId
+ }
+ row.accountantObj={
+ label:row.accountant,
+ value:row.accountantId
+ }
+ row.custodianObj={
+ label:row.custodian,
+ value:row.custodianId
+ }
// row.tolocationId=row.tolocation.value
this.editConfig.infomation = { ...row }
},
--
Gitblit v1.8.0