From 89d75ee7b52a78c26c4eafc2dcb00ffd39daa596 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 13 十二月 2023 16:38:17 +0800
Subject: [PATCH] 出库、入库、调拨、报废新建的时候增加对应单号及编码规范
---
src/views/overview/AddOverviewDialog.vue | 660 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 556 insertions(+), 104 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 94908bd..cb5614a 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -8,9 +8,9 @@
>
<!-- 澶� -->
<div slot="title" class="dialog-header">
- <span>{{ editCommonConfig.title + addName }}</span>
+ <span>{{ editCommonConfig.title === "鏌ョ湅" ? editCommonConfig.title : editCommonConfig.title + addName }}</span>
<div class="header_btns">
- <span class="btn">
+ <span class="btn" :style="{ cursor: thatCursor, color: thatColor }" @click="btnPrint" :disabled="true">
<i class="el-icon-printer"></i>
<span>鎵撳嵃</span>
</span>
@@ -18,7 +18,15 @@
<i class="el-icon-s-tools"></i>
<span>鍔ㄤ綔</span>
</span>
- <el-button v-if="showEdit" plain size="mini" style="margin-left: 15px" @click="editClick">缂栬緫</el-button>
+ <el-button
+ v-if="showEdit"
+ :disabled="this.editConfig.infomation.status === 5"
+ plain
+ size="mini"
+ style="margin-left: 15px"
+ @click="editClick"
+ >缂栬緫</el-button
+ >
</div>
</div>
<!-- 鍐呭 -->
@@ -29,7 +37,6 @@
label-position="right"
label-width="120px"
size="mini"
- style="height: 60vh; overflow-x: hidden"
>
<div>
<!-- <div>aaa</div> -->
@@ -37,18 +44,77 @@
:showButton="showButton"
:isValidateClick="isValidateClick"
:isDelClick="isDelClick"
+ :isCancel="isCancel"
:list="list"
+ :showCancel="showCancel"
@delClick="delClick"
@validateClick="validateClick"
+ @btnCancel="btnCancel"
/>
</div>
<div class="basic-info">
<div class="basic-info-view">
<el-row>
<el-col :span="12">
+ <el-form-item prop="number">
+ <span slot="label">{{ workType === 1 ? "鍏ュ簱" : workType === 2 ? "鍑哄簱" : "璋冩嫧" }}鍗曞彿</span>
+ <el-input
+ style="width: 85%"
+ v-if="
+ editConfig.title == '缂栬緫' ||
+ editConfig.title == '鏌ョ湅' ||
+ (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
+ >
+ </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"
+ v-model="editConfig.infomation.companyName"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 90%"
+ :disabled="!showFooter"
+ @change="companyChange"
+ >
+ <el-option
+ v-for="item in supplierOptions"
+ :key="item.SupplierId"
+ :label="item.SupplierName"
+ :value="{ value: item.SupplierId, label: item.SupplierName }"
+ >
+ </el-option>
+ </el-select>
+ <el-select
+ v-else-if="workType === 2"
+ v-model="editConfig.infomation.companyName"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 90%"
+ :disabled="!showFooter"
+ @change="companyChange"
+ >
+ <el-option
+ v-for="item in clientOptions"
+ :key="item.ClientId"
+ :label="item.ClientName"
+ :value="{ value: item.ClientId, label: item.ClientName }"
+ >
+ </el-option>
+ </el-select>
+ <el-select
+ v-else
v-model="editConfig.infomation.companyName"
placeholder="璇烽�夋嫨"
size="mini"
@@ -107,7 +173,21 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col v-if="showOperationType" :span="12">
+ <el-form-item label="鍏ュ簱绫诲瀷" prop="operationTypeId">
+ <el-select
+ v-model="editConfig.infomation.operationTypeId"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 90%"
+ :disabled="!showFooter"
+ >
+ <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-form-item>
@@ -131,7 +211,12 @@
style="width: 90%"
:disabled="!showFooter"
>
- <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.name" :value="item.id">
+ <el-option
+ v-for="item in toLocationOptions"
+ :key="item.id"
+ :label="item.jointName"
+ :value="item.id"
+ >
</el-option>
</el-select>
</el-form-item>
@@ -145,9 +230,60 @@
style="width: 90%"
:disabled="!showFooter"
>
- <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.name" :value="item.id">
+ <el-option
+ v-for="item in toLocationOptions"
+ :key="item.id"
+ :label="item.jointName"
+ :value="item.id"
+ >
</el-option>
</el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="璐熻矗浜�" prop="contacterName">
+ <el-select
+ v-model="editConfig.infomation.contacterName"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 90%"
+ :disabled="!showFooter"
+ @change="contacterChange"
+ >
+ <el-option
+ v-for="item in memberOptions"
+ :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
+ v-model="editConfig.infomation.memberId"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 90%"
+ :disabled="!showFooter"
+ >
+ <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="24">
+ <el-form-item label="澶囨敞" prop="comment">
+ <el-input
+ v-model.trim="editConfig.infomation.comment"
+ size="mini"
+ type="textarea"
+ style="width: 96%"
+ :autosize="{ minRows: 3 }"
+ :disabled="!showFooter"
+ ></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -155,57 +291,8 @@
<div class="bottom">
<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="second">
- <div class="purchase-view">
- <div class="left">
- <div class="second-label">鍏朵粬淇℃伅</div>
- <!-- <el-form-item v-if="workType !== 1" label="閫佽揣绛栫暐" prop="client_name">
- <el-select
- v-model="editConfig.infomation.memberId"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 90%"
- :disabled="!showFooter"
- >
- <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item> -->
- <el-form-item label="璐熻矗浜�" prop="contacterName">
- <el-select
- v-model="editConfig.infomation.contacterName"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 90%"
- :disabled="!showFooter"
- @change="contacterChange"
- >
- <el-option
- v-for="item in memberOptions"
- :key="item.id"
- :label="item.name"
- :value="{ value: item.id, label: item.name }"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </div>
- <div class="right"></div>
- </div>
- </el-tab-pane>
- <el-tab-pane label="澶囨敞" name="third">
- <el-form-item label="澶囨敞" prop="comment">
- <el-input
- v-model.trim="editConfig.infomation.comment"
- size="mini"
- type="textarea"
- style="width: 85%"
- :autosize="{ minRows: 8 }"
- :disabled="!showFooter"
- ></el-input>
- </el-form-item>
- </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-tabs>
<!-- 鎿嶄綔 -->
<div v-if="activeName === 'first'">
@@ -225,6 +312,94 @@
</el-table-column>
</template>
</CommonFormTableView>
+ </div>
+ <!-- 鐗╂祦淇℃伅 -->
+ <div v-if="activeName === 'two' && this.workType === 2">
+ <el-form
+ :rules="rules2"
+ ref="shipmentsInfo"
+ label-position="right"
+ :model="editConfig.infomation"
+ label-width="120px"
+ size="mini"
+ style="margin-top: 20px"
+ >
+ <el-col :span="12">
+ <el-form-item label="鎵胯繍鍟�">
+ <el-select
+ size="mini"
+ :disabled="!showFooter"
+ v-model="editConfig.infomation.logisticCompanyId"
+ placeholder="璇烽�夋嫨"
+ style="width: 90%"
+ >
+ <el-option
+ v-for="item in editConfig.infomation.carrier"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="杩愬崟鍙�">
+ <el-input
+ style="width: 90%"
+ :disabled="!showFooter"
+ v-model="editConfig.infomation.waybillNumber"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏀惰揣浜�">
+ <el-input
+ style="width: 90%"
+ :disabled="!showFooter"
+ v-model="editConfig.infomation.receiverName"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="receiverPhone">
+ <el-input
+ style="width: 90%"
+ :disabled="!showFooter"
+ v-model="editConfig.infomation.receiverPhone"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏀惰揣鍦板潃">
+ <el-input
+ style="width: 90%"
+ :disabled="!showFooter"
+ v-model="editConfig.infomation.receiverAddr"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="閲嶉噺">
+ <el-input
+ style="width: 90%"
+ :disabled="!showFooter"
+ type="number"
+ v-model="editConfig.infomation.weight"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐗╂祦閲嶉噺">
+ <el-input
+ style="width: 90%"
+ :disabled="!showFooter"
+ type="number"
+ v-model="editConfig.infomation.logisticWeight"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-form>
</div>
<!-- 璇︽儏 -->
<!-- <div v-if="activeName === 'detail'">
@@ -249,9 +424,9 @@
</div>
</el-form>
<!-- 灏� -->
- <div v-if="showFooter" slot="footer" class="dialog-footer">
+ <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('form')">淇濆瓨</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>
@@ -260,10 +435,22 @@
<script>
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
-import { getLocationList, addOperation, updateOperation, updateStatus, deleteOperation } from "@/api/overview/overview"
-import { getCompanyList } from "@/api/common/other"
+import {
+ getLocationList,
+ addOperation,
+ updateOperation,
+ updateStatus,
+ stateCancel,
+ deleteOperation,
+ getListTransfer,
+ getLogisticCompanyList,
+ printReceipts
+} from "@/api/overview/overview"
+import { getSupplierList, getCompanyList, getClientList } from "@/api/common/other"
+import codeMixin from "@/views/overview/mixin/codeMixin"
export default {
name: "AddOverviewDialog",
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -283,6 +470,10 @@
addName: {
type: String,
default: "璋冩嫧"
+ },
+ showOperationType: {
+ type: Boolean,
+ default: false
}
},
components: { CommonFormTableView },
@@ -295,17 +486,25 @@
sourceNumber: [{ required: true, message: "璇疯緭鍏ユ潵婧愬崟鎹�", trigger: "blur" }],
operationDate: [{ required: true, message: "璇烽�夋嫨鏃ユ湡", trigger: "change" }],
toLocationId: [{ required: true, message: "璇烽�夋嫨浠撳簱浣嶇疆", trigger: "change" }],
- fromLocationId: [{ required: true, message: "璇烽�夋嫨婧愪綅缃�", trigger: "change" }]
+ fromLocationId: [{ 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}$/,
+ message: "璇疯緭鍏ユ纭殑鎵嬫満鍙�",
+ trigger: ["blur", "change"]
+ }
+ ]
},
companyOptions: [], // 鍏徃
+ supplierOptions: [], //渚涘簲鍟�
+ clientOptions: [], //瀹㈡埛
memberOptions: [{ id: 1, name: "绠＄悊鍛�" }],
toLocationOptions: [], // 婧愪綅缃� 浠撳簱浣嶇疆
- list: [
- { label: "鑽夌", status: "todo", value: 1 },
- { label: "姝ｅ湪绛夊緟", status: "todo", value: 2 },
- { label: "灏辩华", status: "todo", value: 3 },
- { label: "瀹屾垚", status: "todo", value: 4 }
- ],
showButton: true,
activeName: "first",
productTableList: {},
@@ -314,6 +513,7 @@
isNoProduct: true, // 娣诲姞鏄庣粏琛屾椂鏄惁鏈変骇鍝佹湭閫夋嫨
showEdit: false, // 鏄惁鏄剧ず缂栬緫鎸夐挳
isDelClick: false, // 鍒犻櫎鎸夐挳鏄惁鍙偣鍑�
+ isCancel: false, //楠岃瘉鎸夐挳鏄惁鍙偣鍑�
showFooter: false, // 鏄惁鏄剧ず鍙栨秷淇濆瓨
currentState: "todo", // 褰撳墠鐘舵��
detailTableList: {},
@@ -321,33 +521,96 @@
detailId: 0,
isNoDetail: false, // 娣诲姞璇︽儏鏄庣粏琛屾椂鏄惁鏈�夋嫨
tableColumn: [],
- receiptType: this.addName, // 鍏ュ簱绫诲瀷
+ receiptType: "", // 鍏ュ簱绫诲瀷
companyObj: {},
contacterObj: {},
- isValidateClick: false // 楠岃瘉鏄惁鏄剧ず
+ isValidateClick: false, // 楠岃瘉鏄惁鏄剧ず
+ operationTypeOptions: [], // 鍏ュ簱绫诲瀷鍒楄〃
+ shipmentsInfo: {
+ carrier: [],
+ waybillNumber: "",
+ weight: 0,
+ logisticWeight: 0,
+ receiverPhone: ""
+ },
+ showCancel: false, // 鍙栨秷鏄惁鍙互鏄剧ず
+ list: [],
+ pdfParams: {},
+ thatCursor: this.workType === 3 ? "no-drop" : "pointer",
+ thatColor: this.workType === 3 ? "#ccc" : "#000"
}
},
created() {
+ this.getCompanyList()
+ this.setStatusList()
this.setTableForm()
this.setBottonView()
this.setDetailTableForm()
- this.getCompanyList()
this.getLocationList()
+ this.receiptType = this.editConfig.title === "鏌ョ湅" ? this.editConfig.infomation.operationTypeName : this.addName
+ if (this.showOperationType) {
+ this.getListTransfer()
+ }
+ this.getLogisticCompanyList()
+ this.formInfo()
},
methods: {
+ formInfo() {
+ 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.getRCodeStandardList()
+ },
+ setStatusList() {
+ if (this.editConfig.infomation.status === 5) {
+ 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: 5 }
+ ]
+ } else {
+ this.list = [
+ { label: "鑽夌", status: "todo", value: 1 },
+ { label: "姝ｅ湪绛夊緟", status: "todo", value: 2 },
+ { label: "灏辩华", status: "todo", value: 3 },
+ { label: "瀹屾垚", status: "todo", value: 4 }
+ ]
+ }
+ },
// 鑾峰彇鍏徃鍒楄〃
async getCompanyList() {
- await getCompanyList().then((res) => {
- console.log(res)
- if (res.data.code === 200) {
- this.companyOptions = res.data.data
- }
- })
+ if (this.workType === 1) {
+ await getSupplierList().then((res) => {
+ console.log(res)
+ if (res.code === 200) {
+ this.supplierOptions = res.data
+ }
+ })
+ } else if (this.workType === 2) {
+ await getClientList().then((res) => {
+ console.log(res)
+ if (res.code === 200) {
+ this.clientOptions = res.data
+ }
+ })
+ } else {
+ await getCompanyList().then((res) => {
+ console.log(res)
+ if (res.code === 200) {
+ this.companyOptions = res.data
+ }
+ })
+ }
},
// 鑾峰彇浠撳簱浣嶇疆鍒楄〃
async getLocationList() {
await getLocationList({
keyWord: "",
+ jointName: this.editConfig.code,
page: 0,
pageSize: 0
}).then((res) => {
@@ -357,35 +620,80 @@
}
})
},
+ // 鑾峰彇浠撳簱绫诲瀷
+ async getListTransfer() {
+ await getListTransfer({
+ keyword: "",
+ page: 0,
+ pageSize: 0
+ }).then((res) => {
+ console.log(res.data)
+ if (res.code === 200) {
+ const list = res.data.map((item) => {
+ return {
+ name: item.name,
+ id: item.id
+ }
+ })
+ this.operationTypeOptions = list || []
+ }
+ })
+ },
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
setBottonView() {
+ console.log(this.editConfig.infomation.status)
if (this.editConfig.title === "鏂板缓") {
this.showButton = false
this.showEdit = false
this.showFooter = true
this.isValidateClick = false
- } else if (this.editConfig.infomation.status === 4) {
+ } 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
+ if (this.editConfig.infomation.status === "瀹屾垚") {
+ this.isValidateClick = false
+ } else if (this.editConfig.infomation.status === 3) {
+ this.isValidateClick = true
+ this.showCancel = true
+ } else if (this.editConfig.infomation.status === 5) {
+ this.isCancel = true
+ this.isValidateClick = true
+ } else {
+ 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 === 5) {
+ 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
}
if (this.editConfig.title === "鏂板缓") {
this.list[0].status = "active"
} else {
this.list.map((item) => {
- if (item.value === this.editConfig.infomation.status) {
+ 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"
@@ -404,10 +712,27 @@
this.showFooter = true
this.setTableForm()
},
+ async getLogisticCompanyList() {
+ await getLogisticCompanyList().then((res) => {
+ if (res.code === 200) {
+ this.editConfig.infomation.carrier = res.data
+ }
+ })
+ },
// 淇濆瓨
- saveClick(formName) {
- this.$refs[formName].validate((valid) => {
- if (valid) {
+ saveClick() {
+ let validArr = []
+ if (this.workType === 2) {
+ console.log("鍑哄簱")
+ validArr = [this.$refs.form.validate()]
+ } else {
+ console.log("鍏ュ簱")
+ validArr = [this.$refs.form.validate()]
+ }
+ console.log(validArr, "xxx")
+ Promise.all(validArr)
+ .then((results) => {
+ console.log(results, "鎵ц鎴愬姛")
for (let i = 0; i < this.tableData.length; i++) {
if (this.tableData[i].productName.length === 0) {
this.isNoProduct = true
@@ -427,13 +752,19 @@
console.log(res)
this.editConfig.visible = false
if (res.code === 200) {
- this.$message.success("娣诲姞鎴愬姛")
+ if (this.editConfig.title === "鏂板缓") {
+ this.$message.success("娣诲姞鎴愬姛")
+ } else {
+ this.$message.success("缂栬緫鎴愬姛")
+ }
this.$parent.getData()
}
})
}
- }
- })
+ })
+ .catch((error) => {
+ console.error("琛ㄥ崟鏍￠獙鏈�氳繃:", error)
+ })
},
saveParams() {
let data = this.editConfig.infomation
@@ -443,9 +774,9 @@
let contacterName = ""
if (this.editConfig.title === "鏂板缓") {
companyID = Object.keys(this.companyObj).length === 0 ? 0 : this.companyObj.value
- companyName = Object.keys(this.companyObj).length === 0 ? 0 : this.companyObj.label
+ 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 ? 0 : this.contacterObj.label
+ 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
@@ -453,6 +784,7 @@
contacterName = Object.keys(this.contacterObj).length === 0 ? data.contacterName : this.contacterObj.label
}
let params = {
+ baseOperationType: data.baseOperationType,
comment: data.comment || "",
companyID: companyID,
companyName: companyName,
@@ -461,13 +793,20 @@
details: this.tableData,
fromLocationId: data.fromLocationId || 0,
id: data.id,
- number: "",
+ number: data.number || "",
operationDate: data.operationDate || "",
- operationTypeId: this.editConfig.operationTypeId,
+ operationTypeId: this.showOperationType ? data.operationTypeId : this.editConfig.operationTypeId,
operationTypeName: this.receiptType,
sourceNumber: data.sourceNumber || "",
status: 3,
- toLocationId: data.toLocationId || 0
+ toLocationId: data.toLocationId || 0,
+ waybillNumber: data.waybillNumber || "",
+ weight: data.weight || 0,
+ logisticWeight: data.logisticWeight || 0,
+ logisticCompanyId: data.logisticCompanyId,
+ receiverAddr: data.receiverAddr || "",
+ receiverName: data.receiverName || "",
+ receiverPhone: data.receiverPhone || ""
}
return params
},
@@ -484,7 +823,23 @@
},
// 鎿嶄綔鍒楄〃
setTableForm() {
- this.tableData = this.editConfig.title !== "鏂板缓" ? this.editConfig.infomation.details : []
+ if (
+ this.editConfig.title !== "鏂板缓" &&
+ this.editConfig.infomation.details &&
+ this.editConfig.infomation.details.length > 0
+ ) {
+ const list = this.editConfig.infomation.details.map((item) => {
+ return {
+ ...item,
+ productName: item.product.name,
+ unit: item.product.unit
+ }
+ })
+ this.tableData = list
+ } else {
+ this.tableData = []
+ }
+ // this.tableData = this.editConfig.title !== "鏂板缓" ? list : []
this.productTableList = {
tableData: this.tableData,
tableColumn: [
@@ -492,7 +847,7 @@
// { label: "璇存槑", prop: "number", input: true },
// { label: "鏃ユ湡", prop: "amount", date: true, isRequird: true },
// { label: "鎴鏃ユ湡", prop: "price", date: true },
- { label: "瀹屾垚", prop: "amount", inputFloat: true },
+ { label: "鏁伴噺", prop: "amount", inputFloat: true },
{ label: "璁￠噺鍗曚綅", prop: "unit" }
]
}
@@ -508,6 +863,7 @@
},
// 鏂板
addProductClick(value) {
+ console.log(value)
if (value === "鎿嶄綔") {
console.log(this.tableData)
for (let i = 0; i < this.tableData.length; i++) {
@@ -616,6 +972,60 @@
this.$parent.getData()
}
})
+ },
+
+ // 鍙栨秷
+ btnCancel() {
+ this.$confirm("纭畾鍙栨秷鍚楋紵", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ stateCancel(this.editConfig.infomation.id).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("鍙栨秷璋冩嫧")
+ this.$parent.getData()
+ }
+ })
+ this.list.map((item) => {
+ if (item.label === "宸插彇娑�") {
+ item.status = "active"
+ } else {
+ item.status = "todo"
+ }
+ })
+ })
+ .catch(() => {})
+ },
+ //鎵撳嵃
+ async btnPrint() {
+ if (this.workType !== 3) {
+ localStorage.removeItem("pdfParams")
+ try {
+ let res = await printReceipts(this.editCommonConfig.infomation.id)
+ console.log(res)
+ if (res.code === 200) {
+ 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
+ }
+ var { href } = this.$router.resolve({
+ path: "/overview/previewExcel",
+ query: {
+ ...pdfParams
+ }
+ })
+ window.open(href, "_blank")
+ }
+ } catch (error) {
+ console.error(error)
+ }
+ }
}
}
}
@@ -628,61 +1038,103 @@
align-items: center;
font-size: 14px;
color: #333;
+
.header_btns {
margin-left: auto;
margin-right: 60px;
+
.btn {
+ cursor: pointer;
+ }
+
+ .btn:nth-of-type(2) {
cursor: no-drop;
+ color: #ccc;
}
}
}
+
.content-status {
display: flex;
}
+
.basic-info {
height: calc(100% - 80px);
overflow: auto;
margin: 20px;
- border: 1px solid #dcdfe6;
- box-shadow: inset 0 0 2px #dee2e6;
- -moz-box-shadow: inset 0 0 2px #dee2e6;
- -webkit-box-shadow: inset 0 0 2px #dee2e6;
- .basic-info-view {
- margin-top: 20px;
- }
+ // border: 1px solid #dcdfe6;
+ // box-shadow: inset 0 0 2px #dee2e6;
+ // -moz-box-shadow: inset 0 0 2px #dee2e6;
+ // -webkit-box-shadow: inset 0 0 2px #dee2e6;
+ // .basic-info-view {
+ // margin-top: 20px;
+ // }
}
+
.purchase-view {
display: flex;
+
.left {
width: 50%;
}
+
.right {
width: 50%;
}
}
+
.second-label {
margin-left: 20px;
border-bottom: 1px solid #d9d9d9;
margin-bottom: 10px;
}
+
::v-deep {
.el-dialog__headerbtn {
position: absolute;
- top: 18px;
+ top: 15px;
}
+
.el-button {
&:hover {
border: 1px solid #dcdfe6;
color: #333;
}
}
- .el-tabs--card > .el-tabs__header .el-tabs__nav {
- margin-left: 20px;
+
+ .el-tabs--card > .el-tabs__header {
+ border-bottom: none;
}
+
+ // .el-tabs__item.is-active {
+ // color: #333;
+ // background: #f1f3f8;
+ // }
.el-tabs__item {
height: 30px;
line-height: 30px;
font-size: 13px;
+ background: #f3f3f3;
+ }
+
+ .el-tabs__header {
+ margin: 0 0 1px;
+ }
+
+ .bottom {
+ .el-form {
+ // border-top: 1px solid #EBEEF5;
+ }
+
+ .el-form-item {
+ height: 28px;
+
+ .el-input {
+ input {
+ height: 28px;
+ }
+ }
+ }
}
}
</style>
--
Gitblit v1.8.0